diff --git a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java index 0e686e39..8b066b57 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java @@ -10,6 +10,7 @@ import co.yixiang.utils.OrderUtil; import co.yixiang.utils.RedisUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import me.chanjar.weixin.common.bean.menu.WxMenu; @@ -41,7 +42,7 @@ public class WechatMenuController { @GetMapping(value = "/YxWechatMenu") @PreAuthorize("@el.check('admin','YxWechatMenu_ALL','YxWechatMenu_SELECT')") public ResponseEntity getYxWechatMenus(){ - return new ResponseEntity(YxWechatMenuService.getById("wechat_menus"),HttpStatus.OK); + return new ResponseEntity(YxWechatMenuService.getOne(new QueryWrapper().eq("key","wechat_menus")),HttpStatus.OK); } diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java index a866fd81..f9a31939 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatMenu.java @@ -19,7 +19,7 @@ import java.io.Serializable; public class YxWechatMenu implements Serializable { @Id - @Column(name = "key") + @TableField(value = "`key`") private String key; @@ -36,4 +36,4 @@ public class YxWechatMenu implements Serializable { public void copy(YxWechatMenu source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java index 84b30c77..73545f69 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/domain/YxWechatReply.java @@ -26,7 +26,7 @@ public class YxWechatReply implements Serializable { /** 关键字 */ - @Column(name = "key",unique = true,nullable = false) + @TableField(value = "`key`") @NotBlank private String key; @@ -57,4 +57,4 @@ public class YxWechatReply implements Serializable { public void copy(YxWechatReply source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java index 25066e0b..5445eb41 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatMenuServiceImpl.java @@ -2,6 +2,7 @@ package co.yixiang.mp.service.impl; import co.yixiang.mp.domain.YxWechatMenu; import co.yixiang.common.service.impl.BaseServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import lombok.AllArgsConstructor; import co.yixiang.dozer.service.IGenerator; import com.github.pagehelper.PageHelper; @@ -75,7 +76,7 @@ public class YxWechatMenuServiceImpl extends BaseServiceImpl().eq("key",wechat_menus)); if(yxWechatMenu == null){ return false; } diff --git a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java index 9558e63b..e6135b77 100644 --- a/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java +++ b/yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java @@ -79,7 +79,7 @@ public class YxWechatReplyServiceImpl extends BaseServiceImpl().eq("key",key)); + YxWechatReply yxWechatReply = this.getOne(new QueryWrapper().eq("`key`",key)); return yxWechatReply; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java index f31a9822..78780455 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/domain/YxStorePink.java @@ -1,16 +1,18 @@ package co.yixiang.modules.activity.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; -import java.io.Serializable; +import javax.validation.constraints.*; import java.math.BigDecimal; +import java.io.Serializable; /** * @author hupeng -* @date 2019-11-18 +* @date 2020-05-12 */ @Entity @Data @@ -22,65 +24,96 @@ public class YxStorePink implements Serializable { @Column(name = "id") private Integer id; - // 用户id + + /** 用户id */ @Column(name = "uid",nullable = false) + @NotNull private Integer uid; - // 订单id 生成 + + /** 订单id 生成 */ @Column(name = "order_id",nullable = false) + @NotBlank private String orderId; - // 订单id 数据库 + + /** 订单id 数据库 */ @Column(name = "order_id_key",nullable = false) + @NotNull private Integer orderIdKey; - // 购买商品个数 + + /** 购买商品个数 */ @Column(name = "total_num",nullable = false) + @NotNull private Integer totalNum; - // 购买总金额 + + /** 购买总金额 */ @Column(name = "total_price",nullable = false) + @NotNull private BigDecimal totalPrice; - // 拼团产品id + + /** 拼团产品id */ @Column(name = "cid",nullable = false) + @NotNull private Integer cid; - // 产品id + + /** 产品id */ @Column(name = "pid",nullable = false) + @NotNull private Integer pid; - // 拼图总人数 + + /** 拼图总人数 */ @Column(name = "people",nullable = false) + @NotNull private Integer people; - // 拼团产品单价 + + /** 拼团产品单价 */ @Column(name = "price",nullable = false) + @NotNull private BigDecimal price; - // 开始时间 + + /** 开始时间 */ @Column(name = "add_time",nullable = false) + @NotBlank private String addTime; + @Column(name = "stop_time",nullable = false) + @NotBlank private String stopTime; - // 团长id 0为团长 + + /** 团长id 0为团长 */ @Column(name = "k_id",nullable = false) + @NotNull private Integer kId; - // 是否发送模板消息0未发送1已发送 + + /** 是否发送模板消息0未发送1已发送 */ @Column(name = "is_tpl",nullable = false) + @NotNull private Integer isTpl; - // 是否退款 0未退款 1已退款 + + /** 是否退款 0未退款 1已退款 */ @Column(name = "is_refund",nullable = false) + @NotNull private Integer isRefund; - // 状态1进行中2已完成3未完成 + + /** 状态1进行中2已完成3未完成 */ @Column(name = "status",nullable = false) + @NotNull private Integer status; + public void copy(YxStorePink source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java index 18ef2148..385c962b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java @@ -4,6 +4,7 @@ import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; +import co.yixiang.dozer.service.IGenerator; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.activity.domain.YxUserExtract; import co.yixiang.modules.activity.service.YxUserExtractService; @@ -12,14 +13,11 @@ import co.yixiang.modules.shop.domain.YxUserBill; import co.yixiang.modules.shop.service.YxUserBillService; import co.yixiang.modules.shop.service.YxUserService; import co.yixiang.modules.shop.service.YxWechatUserService; -import co.yixiang.modules.shop.service.dto.YxUserDTO; -import co.yixiang.modules.shop.service.dto.YxWechatUserDTO; -import co.yixiang.mp.config.WxPayConfiguration; +import co.yixiang.modules.shop.service.dto.YxUserDto; +import co.yixiang.modules.shop.service.dto.YxWechatUserDto; import co.yixiang.mp.service.YxPayService; import co.yixiang.utils.OrderUtil; -import com.github.binarywang.wxpay.bean.entpay.EntPayRequest; import com.github.binarywang.wxpay.exception.WxPayException; -import com.github.binarywang.wxpay.service.WxPayService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.data.domain.Pageable; @@ -45,15 +43,17 @@ public class UserExtractController { private final YxUserBillService yxUserBillService; private final YxWechatUserService wechatUserService; private final YxPayService payService; + private final IGenerator generator; - public UserExtractController(YxUserExtractService yxUserExtractService,YxUserService yxUserService, - YxUserBillService yxUserBillService,YxWechatUserService wechatUserService, - YxPayService payService) { + public UserExtractController(YxUserExtractService yxUserExtractService, YxUserService yxUserService, + YxUserBillService yxUserBillService, YxWechatUserService wechatUserService, + YxPayService payService, IGenerator generator) { this.yxUserExtractService = yxUserExtractService; this.yxUserService = yxUserService; this.yxUserBillService = yxUserBillService; this.wechatUserService = wechatUserService; this.payService = payService; + this.generator = generator; } @Log("查询") @@ -82,7 +82,7 @@ public class UserExtractController { throw new BadRequestException("请填写失败原因"); } String mark = "提现失败,退回佣金"+resources.getExtractPrice()+"元"; - YxUserDTO userDTO = yxUserService.findById(resources.getUid()); + YxUserDto userDTO = generator.convert(yxUserService.getById(resources.getUid()),YxUserDto.class); //增加流水 YxUserBill userBill = new YxUserBill(); @@ -97,7 +97,7 @@ public class UserExtractController { userBill.setStatus(1); userBill.setAddTime(OrderUtil.getSecondTimestampTwo()); userBill.setPm(1); - yxUserBillService.create(userBill); + yxUserBillService.save(userBill); //返回提现金额 yxUserService.incBrokeragePrice(resources.getExtractPrice().doubleValue() @@ -109,7 +109,7 @@ public class UserExtractController { //todo 此处为企业付款，没经过测试 boolean isTest = true; if(!isTest){ - YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid()); + YxWechatUserDto wechatUser = generator.convert(wechatUserService.getById(resources.getUid()),YxWechatUserDto.class); if(ObjectUtil.isNotNull(wechatUser)){ try { payService.entPay(wechatUser.getOpenid(),resources.getId().toString(), @@ -128,4 +128,4 @@ public class UserExtractController { } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java index 394c8a02..f592c047 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/YxStorePinkService.java @@ -1,66 +1,40 @@ package co.yixiang.modules.activity.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.activity.domain.YxStorePink; -import co.yixiang.modules.activity.service.dto.YxStorePinkDTO; +import co.yixiang.modules.activity.service.dto.YxStorePinkDto; import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-11-18 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxStorePink") -public interface YxStorePinkService { +public interface YxStorePinkService extends BaseService{ - int countPeople(int id); - - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxStorePinkQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxStorePinkQueryCriteria criteria); + List queryAll(YxStorePinkQueryCriteria criteria); /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxStorePinkDTO findById(Integer id); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxStorePinkDTO create(YxStorePink resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxStorePink resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java similarity index 51% rename from yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java index 99b0aa04..4f3d7689 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkDto.java @@ -1,69 +1,59 @@ package co.yixiang.modules.activity.service.dto; import lombok.Data; - -import java.io.Serializable; import java.math.BigDecimal; - +import java.io.Serializable; /** * @author hupeng -* @date 2019-11-18 +* @date 2020-05-12 */ @Data -public class YxStorePinkDTO implements Serializable { +public class YxStorePinkDto implements Serializable { private Integer id; - // 用户id + /** 用户id */ private Integer uid; - // 订单id 生成 + /** 订单id 生成 */ private String orderId; - // 订单id 数据库 + /** 订单id 数据库 */ private Integer orderIdKey; - private String title; - - private String nickname; - - private String avatar; - - private Integer countPeople; - - // 购买商品个数 + /** 购买商品个数 */ private Integer totalNum; - // 购买总金额 + /** 购买总金额 */ private BigDecimal totalPrice; - // 拼团产品id + /** 拼团产品id */ private Integer cid; - // 产品id + /** 产品id */ private Integer pid; - // 拼图总人数 + /** 拼图总人数 */ private Integer people; - // 拼团产品单价 + /** 拼团产品单价 */ private BigDecimal price; - // 开始时间 + /** 开始时间 */ private String addTime; private String stopTime; - // 团长id 0为团长 + /** 团长id 0为团长 */ private Integer kId; - // 是否发送模板消息0未发送1已发送 + /** 是否发送模板消息0未发送1已发送 */ private Integer isTpl; - // 是否退款 0未退款 1已退款 + /** 是否退款 0未退款 1已退款 */ private Integer isRefund; - // 状态1进行中2已完成3未完成 + /** 状态1进行中2已完成3未完成 */ private Integer status; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java index fbc03eb9..6d7875e6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStorePinkQueryCriteria.java @@ -1,14 +1,13 @@ package co.yixiang.modules.activity.service.dto; -import co.yixiang.annotation.Query; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-11-18 +* @date 2020-05-12 */ @Data public class YxStorePinkQueryCriteria{ - @Query - private Integer kId; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java index e6f46ab0..e0e3a82b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java @@ -49,7 +49,7 @@ public class YxStoreCouponUserServiceImpl implements YxStoreCouponUserService { List storeOrderDTOS = yxStoreCouponUserMapper .toDto(page.getContent()); for (YxStoreCouponUserDTO couponUserDTO : storeOrderDTOS) { - couponUserDTO.setNickname(userService.findById(couponUserDTO.getUid()).getNickname()); + couponUserDTO.setNickname(userService.getById(couponUserDTO.getUid()).getNickname()); } Map map = new LinkedHashMap<>(2); map.put("content",storeOrderDTOS); @@ -92,4 +92,4 @@ public class YxStoreCouponUserServiceImpl implements YxStoreCouponUserService { public void delete(Integer id) { yxStoreCouponUserRepository.deleteById(id); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java index 3dd53567..63f3eac8 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java @@ -1,116 +1,89 @@ package co.yixiang.modules.activity.service.impl; import co.yixiang.modules.activity.domain.YxStorePink; -import co.yixiang.modules.activity.repository.YxStorePinkRepository; -import co.yixiang.modules.activity.service.YxStoreCombinationService; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.activity.service.YxStorePinkService; -import co.yixiang.modules.activity.service.dto.YxStoreCombinationDTO; -import co.yixiang.modules.activity.service.dto.YxStorePinkDTO; +import co.yixiang.modules.activity.service.dto.YxStorePinkDto; import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria; import co.yixiang.modules.activity.service.mapper.YxStorePinkMapper; -import co.yixiang.modules.shop.service.YxUserService; -import co.yixiang.modules.shop.service.dto.YxUserDTO; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - -import java.util.LinkedHashMap; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2019-11-18 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxStorePink") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStorePinkServiceImpl implements YxStorePinkService { +public class YxStorePinkServiceImpl extends BaseServiceImpl implements YxStorePinkService { - private final YxStorePinkRepository yxStorePinkRepository; - - private final YxStoreCombinationService combinationService; - private final YxUserService userService; - - private final YxStorePinkMapper yxStorePinkMapper; - - public YxStorePinkServiceImpl(YxStorePinkRepository yxStorePinkRepository, YxStoreCombinationService combinationService, - YxUserService userService, YxStorePinkMapper yxStorePinkMapper) { - this.yxStorePinkRepository = yxStorePinkRepository; - this.combinationService = combinationService; - this.userService = userService; - this.yxStorePinkMapper = yxStorePinkMapper; - } - - /** - * 参与拼团的人 - * @param id id - * @return - */ - @Override - public int countPeople(int id) { - return yxStorePinkRepository.countByKId(id) + 1; - } + private final IGenerator generator; @Override - public Map queryAll(YxStorePinkQueryCriteria criteria, Pageable pageable){ - criteria.setKId(0); - Page page = yxStorePinkRepository - .findAll((root, criteriaQuery, criteriaBuilder) - -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - List storePinkDTOS = yxStorePinkMapper.toDto(page.getContent()); - for (YxStorePinkDTO storePinkDTO : storePinkDTOS) { - YxStoreCombinationDTO combinationDTO = combinationService - .findById(storePinkDTO.getCid()); - YxUserDTO userDTO = userService.findById(storePinkDTO.getUid()); - - storePinkDTO.setAvatar(userDTO.getAvatar()); - storePinkDTO.setNickname(userDTO.getNickname()); - storePinkDTO.setTitle(combinationDTO.getTitle()); - storePinkDTO.setCountPeople(countPeople(storePinkDTO.getId())); - } - Map map = new LinkedHashMap<>(2); - map.put("content",storePinkDTOS); - map.put("totalElements",page.getTotalElements()); - + //@Cacheable + public Map queryAll(YxStorePinkQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxStorePinkDto.class)); + map.put("totalElements", page.getTotal()); return map; } - @Override - public List queryAll(YxStorePinkQueryCriteria criteria){ - return yxStorePinkMapper.toDto(yxStorePinkRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } @Override - public YxStorePinkDTO findById(Integer id) { - Optional yxStorePink = yxStorePinkRepository.findById(id); - ValidationUtil.isNull(yxStorePink,"YxStorePink","id",id); - return yxStorePinkMapper.toDto(yxStorePink.get()); + //@Cacheable + public List queryAll(YxStorePinkQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxStorePink.class, criteria)); } - @Override - @Transactional(rollbackFor = Exception.class) - public YxStorePinkDTO create(YxStorePink resources) { - return yxStorePinkMapper.toDto(yxStorePinkRepository.save(resources)); - } @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxStorePink resources) { - Optional optionalYxStorePink = yxStorePinkRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxStorePink,"YxStorePink","id",resources.getId()); - YxStorePink yxStorePink = optionalYxStorePink.get(); - yxStorePink.copy(resources); - yxStorePinkRepository.save(yxStorePink); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - yxStorePinkRepository.deleteById(id); + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxStorePinkDto yxStorePink : all) { + Map map = new LinkedHashMap<>(); + map.put("用户id", yxStorePink.getUid()); + map.put("订单id 生成", yxStorePink.getOrderId()); + map.put("订单id 数据库", yxStorePink.getOrderIdKey()); + map.put("购买商品个数", yxStorePink.getTotalNum()); + map.put("购买总金额", yxStorePink.getTotalPrice()); + map.put("拼团产品id", yxStorePink.getCid()); + map.put("产品id", yxStorePink.getPid()); + map.put("拼图总人数", yxStorePink.getPeople()); + map.put("拼团产品单价", yxStorePink.getPrice()); + map.put("开始时间", yxStorePink.getAddTime()); + map.put(" stopTime", yxStorePink.getStopTime()); + map.put("团长id 0为团长", yxStorePink.getKId()); + map.put("是否发送模板消息0未发送1已发送", yxStorePink.getIsTpl()); + map.put("是否退款 0未退款 1已退款", yxStorePink.getIsRefund()); + map.put("状态1进行中2已完成3未完成", yxStorePink.getStatus()); + list.add(map); + } + FileUtil.downloadExcel(list, response); } } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStorePinkMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStorePinkMapper.java index a01582c6..8848dcb9 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStorePinkMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/activity/service/mapper/YxStorePinkMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.activity.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.activity.domain.YxStorePink; -import co.yixiang.modules.activity.service.dto.YxStorePinkDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-11-18 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxStorePinkMapper extends EntityMapper { +@Repository +@Mapper +public interface YxStorePinkMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/StoreOrderCartInfo.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/StoreOrderCartInfo.java deleted file mode 100644 index bbb7e7e3..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/StoreOrderCartInfo.java +++ /dev/null @@ -1,36 +0,0 @@ -package co.yixiang.modules.shop.domain; - -import lombok.Data; - -import javax.persistence.*; - -/** - * @ClassName StoreOrderCartInfo - * @Author hupeng <610796224@qq.com> - * @Date 2019/10/14 - **/ - -@Entity -@Data -@Table(name="yx_store_order_cart_info") -public class StoreOrderCartInfo { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private Integer id; - - @Column(name = "oid") - private Integer oid; - - @Column(name = "cart_id") - private Integer cartId; - - @Column(name = "cart_info") - private String cartInfo; - - @Column(name = "unique") - private String unique; - - -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java index 9aa70257..b5672545 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxExpress.java @@ -1,48 +1,54 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; +import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng -* @date 2019-12-12 +* @date 2020-05-12 */ @Entity @Data @Table(name="yx_express") public class YxExpress implements Serializable { - // 快递公司id + /** 快递公司id */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Integer id; - // 快递公司简称 + + /** 快递公司简称 */ @Column(name = "code",unique = true,nullable = false) - @NotBlank(message = "快递公司编号不能为空") + @NotBlank private String code; - // 快递公司全称 + + /** 快递公司全称 */ @Column(name = "name",nullable = false) - @NotBlank(message = "快递公司名称不能为空") + @NotBlank private String name; - // 排序 + + /** 排序 */ @Column(name = "sort",nullable = false) - @NotNull(message = "排序必填") + @NotNull private Integer sort; - // 是否显示 - @Column(name = "is_show",insertable = false) + + /** 是否显示 */ + @Column(name = "is_show",nullable = false) + @NotNull private Integer isShow; + public void copy(YxExpress source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java index 7cbc3516..930dd714 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterial.java @@ -1,10 +1,10 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import org.hibernate.annotations.CreationTimestamp; - import javax.persistence.*; import javax.validation.constraints.*; import java.sql.Timestamp; @@ -12,7 +12,7 @@ import java.io.Serializable; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ @Entity @Data @@ -25,37 +25,61 @@ public class YxMaterial implements Serializable { private String id; + /** 所属租户 */ + @Column(name = "user_id",nullable = false) + @NotBlank + private String userId; + + /** 逻辑删除标记（0：显示；1：隐藏） */ - @Column(name = "del_flag",nullable = false,insertable = false) - private String delFlag; + @Column(name = "del_flag",nullable = false) + @NotBlank + @TableLogic + @TableField(fill=FieldFill.INSERT_UPDATE) + private Boolean delFlag; + /** 创建时间 */ @Column(name = "create_time",nullable = false) - @CreationTimestamp + @NotNull + @TableField(fill= FieldFill.INSERT) private Timestamp createTime; + /** 最后更新时间 */ + @Column(name = "update_time",nullable = false) + @NotNull + @TableField(fill= FieldFill.INSERT_UPDATE) + private Timestamp updateTime; + + /** 创建者ID */ @Column(name = "create_id") private String createId; + /** 类型1、图片；2、视频 */ @Column(name = "type",nullable = false) + @NotBlank private String type; + /** 分组ID */ @Column(name = "group_id") private String groupId; + /** 素材名 */ @Column(name = "name",nullable = false) @NotBlank private String name; + /** 素材链接 */ @Column(name = "url") private String url; + public void copy(YxMaterial source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java index 31f68fb2..a73b8dd6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxMaterialGroup.java @@ -1,10 +1,10 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import org.hibernate.annotations.CreationTimestamp; - import javax.persistence.*; import javax.validation.constraints.*; import java.sql.Timestamp; @@ -12,7 +12,7 @@ import java.io.Serializable; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ @Entity @Data @@ -25,25 +25,45 @@ public class YxMaterialGroup implements Serializable { private String id; + /** 所属租户 */ + @Column(name = "user_id",nullable = false) + @NotBlank + private String userId; + + /** 逻辑删除标记（0：显示；1：隐藏） */ - @Column(name = "del_flag",nullable = false,insertable = false) - private String delFlag; + @Column(name = "del_flag",nullable = false) + @NotBlank + @TableLogic + @TableField(fill=FieldFill.INSERT_UPDATE) + private Boolean delFlag; + /** 创建时间 */ @Column(name = "create_time",nullable = false) - @CreationTimestamp + @NotNull + @TableField(fill= FieldFill.INSERT) private Timestamp createTime; + /** 最后更新时间 */ + @Column(name = "update_time",nullable = false) + @NotNull + @TableField(fill= FieldFill.INSERT_UPDATE) + private Timestamp updateTime; + + /** 创建者ID */ @Column(name = "create_id") private String createId; + /** 分组名 */ @Column(name = "name",nullable = false) @NotBlank private String name; + public void copy(YxMaterialGroup source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java index b0c5d322..9bd3935d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCart.java @@ -1,6 +1,8 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -8,9 +10,9 @@ import javax.validation.constraints.*; import java.io.Serializable; /** - * @author xwb - * @date 2020-04-02 - */ +* @author hupeng +* @date 2020-05-12 +*/ @Entity @Data @Table(name="yx_store_cart") @@ -22,66 +24,79 @@ public class YxStoreCart implements Serializable { @Column(name = "id") private Long id; + /** 用户ID */ @Column(name = "uid",nullable = false) @NotNull private Integer uid; + /** 类型 */ @Column(name = "type",nullable = false) @NotBlank private String type; + /** 商品ID */ @Column(name = "product_id",nullable = false) @NotNull private Integer productId; + /** 商品属性 */ @Column(name = "product_attr_unique",nullable = false) @NotBlank private String productAttrUnique; + /** 商品数量 */ @Column(name = "cart_num",nullable = false) @NotNull private Integer cartNum; + /** 添加时间 */ @Column(name = "add_time",nullable = false) @NotNull private Integer addTime; + /** 0 = 未购买 1 = 已购买 */ @Column(name = "is_pay",nullable = false) @NotNull private Integer isPay; + /** 是否删除 */ @Column(name = "is_del",nullable = false) @NotNull private Integer isDel; + /** 是否为立即购买 */ @Column(name = "is_new",nullable = false) @NotNull private Integer isNew; + /** 拼团id */ @Column(name = "combination_id") private Integer combinationId; + /** 秒杀产品ID */ @Column(name = "seckill_id",nullable = false) @NotNull private Integer seckillId; + /** 砍价id */ @Column(name = "bargain_id",nullable = false) @NotNull private Integer bargainId; + public void copy(YxStoreCart source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java index 5730f8c4..fe5dc0fa 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreCategory.java @@ -1,71 +1,68 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; -import lombok.Getter; -import lombok.Setter; -import org.hibernate.annotations.Where; - import javax.persistence.*; -import javax.validation.constraints.NotBlank; +import javax.validation.constraints.*; import java.io.Serializable; -import java.util.List; -import java.util.Objects; /** * @author hupeng -* @date 2019-10-03 +* @date 2020-05-12 */ @Entity -@Getter -@Setter +@Data @Table(name="yx_store_category") -//@Where(clause = "is_del = 0") public class YxStoreCategory implements Serializable { - // 商品分类表ID + /** 商品分类表ID */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Integer id; - // 父id + + /** 父id */ @Column(name = "pid",nullable = false) + @NotNull private Integer pid; - // 分类名称 + + /** 分类名称 */ @Column(name = "cate_name",nullable = false) - @NotBlank(message = "分类名称不能为空") + @NotBlank private String cateName; -// @OneToMany -// @JoinColumn(name = "cate_id") -// private List storeProducts; - // 排序 - @Column(name = "sort",nullable = false) + /** 排序 */ + @Column(name = "sort") private Integer sort; - // 图标 - @Column(name = "pic",nullable = false) - //@NotBlank(message = "请上传分类图片") + + /** 图标 */ + @Column(name = "pic") private String pic; - // 是否推荐 - @Column(name = "is_show",nullable = false) + + /** 是否推荐 */ + @Column(name = "is_show") private Integer isShow; - // 添加时间 - @Column(name = "add_time",nullable = false) + + /** 添加时间 */ + @Column(name = "add_time") private Integer addTime; - @Column(name = "is_del",insertable = false) + + /** 删除状态 */ + @Column(name = "is_del") private Integer isDel; + public void copy(YxStoreCategory source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } - - } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java index 6d332750..2af5214a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrder.java @@ -1,237 +1,323 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; -import java.io.Serializable; +import javax.validation.constraints.*; import java.math.BigDecimal; +import java.io.Serializable; /** * @author hupeng -* @date 2019-10-14 +* @date 2020-05-12 */ @Entity @Data @Table(name="yx_store_order") public class YxStoreOrder implements Serializable { - // 订单ID + /** 订单ID */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Integer id; - // 订单号 + + /** 订单号 */ @Column(name = "order_id",nullable = false) + @NotBlank private String orderId; - // 订单号 - @Column(name = "extend_order_id",nullable = true) + + /** 额外订单号 */ + @Column(name = "extend_order_id") private String extendOrderId; - // 用户id + /** 用户id */ @Column(name = "uid",nullable = false) + @NotNull private Integer uid; - // 用户姓名 + + /** 用户姓名 */ @Column(name = "real_name",nullable = false) + @NotBlank private String realName; - // 用户电话 + + /** 用户电话 */ @Column(name = "user_phone",nullable = false) + @NotBlank private String userPhone; - // 详细地址 + + /** 详细地址 */ @Column(name = "user_address",nullable = false) + @NotBlank private String userAddress; - // 购物车id + + /** 购物车id */ @Column(name = "cart_id",nullable = false) + @NotBlank private String cartId; - // 运费金额 + + /** 运费金额 */ @Column(name = "freight_price",nullable = false) + @NotNull private BigDecimal freightPrice; - // 订单商品总数 + + /** 订单商品总数 */ @Column(name = "total_num",nullable = false) + @NotNull private Integer totalNum; - // 订单总价 + + /** 订单总价 */ @Column(name = "total_price",nullable = false) + @NotNull private BigDecimal totalPrice; - // 邮费 + + /** 邮费 */ @Column(name = "total_postage",nullable = false) + @NotNull private BigDecimal totalPostage; - // 实际支付金额 + + /** 实际支付金额 */ @Column(name = "pay_price",nullable = false) + @NotNull private BigDecimal payPrice; - // 支付邮费 + + /** 支付邮费 */ @Column(name = "pay_postage",nullable = false) + @NotNull private BigDecimal payPostage; - // 抵扣金额 + + /** 抵扣金额 */ @Column(name = "deduction_price",nullable = false) + @NotNull private BigDecimal deductionPrice; - // 优惠券id + + /** 优惠券id */ @Column(name = "coupon_id",nullable = false) + @NotNull private Integer couponId; - // 优惠券金额 + + /** 优惠券金额 */ @Column(name = "coupon_price",nullable = false) + @NotNull private BigDecimal couponPrice; - // 支付状态 + + /** 支付状态 */ @Column(name = "paid",nullable = false) + @NotNull private Integer paid; - // 支付时间 + + /** 支付时间 */ @Column(name = "pay_time") private Integer payTime; - // 支付方式 + + /** 支付方式 */ @Column(name = "pay_type",nullable = false) + @NotBlank private String payType; - // 创建时间 + + /** 创建时间 */ @Column(name = "add_time",nullable = false) + @NotNull private Integer addTime; - // 订单状态（-1 : 申请退款 -2 : 退货成功 0：待发货；1：待收货；2：已收货；3：待评价；-1：已退款） + + /** 订单状态（-1 : 申请退款 -2 : 退货成功 0：待发货；1：待收货；2：已收货；3：待评价；-1：已退款） */ @Column(name = "status",nullable = false) + @NotNull private Integer status; - // 0 未退款 1 申请中 2 已退款 + + /** 0 未退款 1 申请中 2 已退款 */ @Column(name = "refund_status",nullable = false) + @NotNull private Integer refundStatus; - // 退款图片 + + /** 退款图片 */ @Column(name = "refund_reason_wap_img") private String refundReasonWapImg; - // 退款用户说明 + + /** 退款用户说明 */ @Column(name = "refund_reason_wap_explain") private String refundReasonWapExplain; - // 退款时间 + + /** 退款时间 */ @Column(name = "refund_reason_time") private Integer refundReasonTime; - // 前台退款原因 + + /** 前台退款原因 */ @Column(name = "refund_reason_wap") private String refundReasonWap; - // 不退款的理由 + + /** 不退款的理由 */ @Column(name = "refund_reason") private String refundReason; - // 退款金额 + + /** 退款金额 */ @Column(name = "refund_price",nullable = false) + @NotNull private BigDecimal refundPrice; - // 快递名称/送货人姓名 - @Column(name = "delivery_name") - //@NotBlank(message = "请选择快递公司") - private String deliveryName; + /** 快递公司编号 */ @Column(name = "delivery_sn") private String deliverySn; - // 发货类型 + /** 快递名称/送货人姓名 */ + @Column(name = "delivery_name") + private String deliveryName; + + + /** 发货类型 */ @Column(name = "delivery_type") private String deliveryType; - // 快递单号/手机号 + + /** 快递单号/手机号 */ @Column(name = "delivery_id") - //@NotBlank(message = "快递单号不能为空") private String deliveryId; - // 消费赚取积分 + + /** 消费赚取积分 */ @Column(name = "gain_integral",nullable = false) + @NotNull private BigDecimal gainIntegral; - // 使用积分 + + /** 使用积分 */ @Column(name = "use_integral",nullable = false) + @NotNull private BigDecimal useIntegral; - // 给用户退了多少积分 + + /** 给用户退了多少积分 */ @Column(name = "back_integral") private BigDecimal backIntegral; - // 备注 + + /** 备注 */ @Column(name = "mark",nullable = false) + @NotBlank private String mark; - // 是否删除 + + /** 是否删除 */ @Column(name = "is_del",nullable = false) + @NotNull private Integer isDel; - // 唯一id(md5加密)类似id - @Column(name = "`unique`",unique = true,nullable = false) + + /** 唯一id(md5加密)类似id */ + @TableField(value = "`unique`") + @NotBlank private String unique; - // 管理员备注 + + /** 管理员备注 */ @Column(name = "remark") private String remark; - // 商户ID + + /** 商户ID */ @Column(name = "mer_id",nullable = false) + @NotNull private Integer merId; + @Column(name = "is_mer_check",nullable = false) + @NotNull private Integer isMerCheck; - // 拼团产品id0一般产品 + + /** 拼团产品id0一般产品 */ @Column(name = "combination_id") private Integer combinationId; - // 拼团id 0没有拼团 + + /** 拼团id 0没有拼团 */ @Column(name = "pink_id",nullable = false) + @NotNull private Integer pinkId; - // 成本价 + + /** 成本价 */ @Column(name = "cost",nullable = false) + @NotNull private BigDecimal cost; - // 秒杀产品ID + + /** 秒杀产品ID */ @Column(name = "seckill_id",nullable = false) + @NotNull private Integer seckillId; - // 砍价id + + /** 砍价id */ @Column(name = "bargain_id") private Integer bargainId; - // 核销码 + + /** 核销码 */ @Column(name = "verify_code",nullable = false) + @NotBlank private String verifyCode; - // 门店id + + /** 门店id */ @Column(name = "store_id",nullable = false) + @NotNull private Integer storeId; - // 配送方式 1=快递 ，2=门店自提 + + /** 配送方式 1=快递 ，2=门店自提 */ @Column(name = "shipping_type",nullable = false) + @NotNull private Integer shippingType; - // 支付渠道(0微信公众号1微信小程序) + + /** 支付渠道(0微信公众号1微信小程序) */ @Column(name = "is_channel") private Integer isChannel; + @Column(name = "is_remind") private Integer isRemind; + @Column(name = "is_system_del") private Integer isSystemDel; + public void copy(YxStoreOrder source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java new file mode 100644 index 00000000..c1476eab --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderCartInfo.java @@ -0,0 +1,58 @@ +package co.yixiang.modules.shop.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.bean.copier.CopyOptions; +import javax.persistence.*; +import javax.validation.constraints.*; +import java.io.Serializable; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Entity +@Data +@Table(name="yx_store_order_cart_info") +public class YxStoreOrderCartInfo implements Serializable { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Integer id; + + + /** 订单id */ + @Column(name = "oid",nullable = false) + @NotNull + private Integer oid; + + + /** 购物车id */ + @Column(name = "cart_id",nullable = false) + @NotNull + private Integer cartId; + + + /** 商品ID */ + @Column(name = "product_id",nullable = false) + @NotNull + private Integer productId; + + + /** 购买东西的详细信息 */ + @Column(name = "cart_info",nullable = false) + @NotBlank + private String cartInfo; + + + /** 唯一id */ + @TableField(value = "`unique`") + @NotBlank + private String unique; + + + public void copy(YxStoreOrderCartInfo source){ + BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); + } +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java index 64360b32..7820a700 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreOrderStatus.java @@ -1,15 +1,17 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; +import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng -* @date 2019-11-02 +* @date 2020-05-12 */ @Entity @Data @@ -21,22 +23,31 @@ public class YxStoreOrderStatus implements Serializable { @Column(name = "id") private Integer id; - // 订单id + + /** 订单id */ @Column(name = "oid",nullable = false) + @NotNull private Integer oid; - // 操作类型 + + /** 操作类型 */ @Column(name = "change_type",nullable = false) + @NotBlank private String changeType; - // 操作备注 + + /** 操作备注 */ @Column(name = "change_message",nullable = false) + @NotBlank private String changeMessage; - // 操作时间 + + /** 操作时间 */ @Column(name = "change_time",nullable = false) + @NotNull private Integer changeTime; + public void copy(YxStoreOrderStatus source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java index a3f3de07..a8140fdb 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProduct.java @@ -1,207 +1,214 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; -import org.hibernate.annotations.NotFound; -import org.hibernate.annotations.NotFoundAction; - import javax.persistence.*; -import javax.validation.constraints.Min; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; +import javax.validation.constraints.*; import java.math.BigDecimal; +import java.io.Serializable; /** * @author hupeng -* @date 2019-10-04 +* @date 2020-05-12 */ @Entity @Data @Table(name="yx_store_product") public class YxStoreProduct implements Serializable { - // 商品id + /** 商品id */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Integer id; - // 商户Id(0为总后台管理员创建,不为0的时候是商户后台创建) - @Column(name = "mer_id",nullable = false) + + /** 商户Id(0为总后台管理员创建,不为0的时候是商户后台创建) */ + @Column(name = "mer_id") private Integer merId; - // 商品图片 + + /** 商品图片 */ @Column(name = "image",nullable = false) - @NotBlank(message = "请上传商品图片") + @NotBlank private String image; - // 轮播图 + + /** 轮播图 */ @Column(name = "slider_image",nullable = false) - @NotBlank(message = "请上传轮播图") + @NotBlank private String sliderImage; - // 商品名称 + + /** 商品名称 */ @Column(name = "store_name",nullable = false) - @NotBlank(message = "请填写商品名称") + @NotBlank private String storeName; - // 商品简介 + + /** 商品简介 */ @Column(name = "store_info",nullable = false) - @NotBlank(message = "请填写商品简介") + @NotBlank private String storeInfo; - // 关键字 + + /** 关键字 */ @Column(name = "keyword",nullable = false) - @NotBlank(message = "请填写关键字") + @NotBlank private String keyword; - // 产品条码（一维码） - @Column(name = "bar_code",nullable = false) + + /** 产品条码（一维码） */ + @Column(name = "bar_code") private String barCode; - // private Integer cateId; - @ManyToOne(fetch=FetchType.LAZY,optional = false) - @JoinColumn(name = "cate_id") - @NotFound(action= NotFoundAction.IGNORE) - private YxStoreCategory storeCategory; + /** 分类id */ + @Column(name = "cate_id",nullable = false) + @NotBlank + private String cateId; - // 商品价格 + + /** 商品价格 */ @Column(name = "price",nullable = false) - @NotNull(message = "价格必填") - @Min(value = 0) + @NotNull private BigDecimal price; - // 会员价格 - @Column(name = "vip_price",insertable = false) - //@NotNull(message = "会员价必填") - //@Min(value = 0) + + /** 会员价格 */ + @Column(name = "vip_price") private BigDecimal vipPrice; - // 市场价 - @Column(name = "ot_price",nullable = false) - @NotNull(message = "原价必填") - @Min(value = 0) + + /** 市场价 */ + @Column(name = "ot_price") private BigDecimal otPrice; - // 邮费 - @Column(name = "postage",nullable = false) - @NotNull(message = "邮费必填") - @Min(value = 0) + + /** 邮费 */ + @Column(name = "postage") private BigDecimal postage; - // 单位名 - @Column(name = "unit_name",nullable = false) - @NotBlank(message = "请填写单位") + + /** 单位名 */ + @Column(name = "unit_name") private String unitName; - // 排序 - @Column(name = "sort",nullable = false) - @NotNull(message = "排序必填") - @Min(value = 0) + + /** 排序 */ + @Column(name = "sort") private Integer sort; - // 销量 - @Column(name = "sales",nullable = false) - @NotNull(message = "销量必填") - @Min(value = 0) + + /** 销量 */ + @Column(name = "sales") private Integer sales; - // 库存 - @Column(name = "stock",nullable = false) - @NotNull(message = "库存必填") - @Min(value = 0) + + /** 库存 */ + @Column(name = "stock") private Integer stock; - // 状态（0：未上架，1：上架） - @Column(name = "is_show",insertable = false) - //@NotNull(message = "状态必须选择") + + /** 状态（0：未上架，1：上架） */ + @Column(name = "is_show") private Integer isShow; - // 是否热卖 + + /** 是否热卖 */ @Column(name = "is_hot") - @NotNull(message = "热卖单品必须选择") private Integer isHot; - // 是否优惠 + + /** 是否优惠 */ @Column(name = "is_benefit") - @NotNull(message = "优惠推荐必须选择") private Integer isBenefit; - // 是否精品 - @Column(name = "is_best",columnDefinition="int default 0") - @NotNull(message = "精品状态必须选择") + + /** 是否精品 */ + @Column(name = "is_best") private Integer isBest; - // 是否新品 - @Column(name = "is_new",columnDefinition="int default 0") - @NotNull(message = "首发新品必须选择") + + /** 是否新品 */ + @Column(name = "is_new") private Integer isNew; - // 产品描述 - @Column(name = "description",nullable = false) - @NotBlank(message = "产品描述") + + /** 产品描述 */ + @Column(name = "description") private String description; - // 添加时间 - @Column(name = "add_time",nullable = false) + + /** 添加时间 */ + @Column(name = "add_time") private Integer addTime; - // 是否包邮 + + /** 是否包邮 */ @Column(name = "is_postage") - @NotNull(message = "包邮状态必须选择") private Integer isPostage; - // 是否删除 - @Column(name = "is_del",insertable = false) + + /** 是否删除 */ + @Column(name = "is_del") private Integer isDel; - // 商户是否代理 0不可代理1可代理 - @Column(name = "mer_use",nullable = false) + + /** 商户是否代理 0不可代理1可代理 */ + @Column(name = "mer_use") private Integer merUse; - // 获得积分 + + /** 获得积分 */ @Column(name = "give_integral") - @NotNull(message = "奖励积分不能为空") - @Min(value = 0) private BigDecimal giveIntegral; - // 成本价 + + /** 成本价 */ @Column(name = "cost") - @NotNull(message = "成本价不能为空") - @Min(value = 0) private BigDecimal cost; - // 秒杀状态 0 未开启 1已开启 - @Column(name = "is_seckill",columnDefinition="int default 0") + + /** 秒杀状态 0 未开启 1已开启 */ + @Column(name = "is_seckill") private Integer isSeckill; - // 砍价状态 0未开启 1开启 - @Column(name = "is_bargain",columnDefinition="int default 0") + + /** 砍价状态 0未开启 1开启 */ + @Column(name = "is_bargain") private Integer isBargain; - // 是否优品推荐 - @Column(name = "is_good",columnDefinition="int default 0") + + /** 是否优品推荐 */ + @Column(name = "is_good") private Integer isGood; - // 虚拟销量 - @Column(name = "ficti",columnDefinition="int default 0") + + /** 虚拟销量 */ + @Column(name = "ficti") private Integer ficti; - // 浏览量 - @Column(name = "browse",columnDefinition="int default 0") + + /** 浏览量 */ + @Column(name = "browse") private Integer browse; - // 产品二维码地址(用户小程序海报) + + /** 产品二维码地址(用户小程序海报) */ @Column(name = "code_path",nullable = false) + @NotBlank private String codePath; - // 淘宝京东1688类型 + + /** 淘宝京东1688类型 */ @Column(name = "soure_link") private String soureLink; + public void copy(YxStoreProduct source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java index 2aed4b7b..30fed80c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttr.java @@ -1,15 +1,17 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; +import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng -* @date 2019-10-13 +* @date 2020-05-12 */ @Entity @Data @@ -20,18 +22,26 @@ public class YxStoreProductAttr implements Serializable { @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Integer id; - // 商品ID + + + /** 商品ID */ @Column(name = "product_id",nullable = false) + @NotNull private Integer productId; - // 属性名 + + /** 属性名 */ @Column(name = "attr_name",nullable = false) + @NotBlank private String attrName; - // 属性值 + + /** 属性值 */ @Column(name = "attr_values",nullable = false) + @NotBlank private String attrValues; + public void copy(YxStoreProductAttr source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java index 6894a688..c731a6c4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrResult.java @@ -1,15 +1,17 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; +import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng -* @date 2019-10-13 +* @date 2020-05-12 */ @Entity @Data @@ -21,18 +23,25 @@ public class YxStoreProductAttrResult implements Serializable { @Column(name = "id") private Integer id; - // 商品ID + + /** 商品ID */ @Column(name = "product_id",nullable = false) + @NotNull private Integer productId; - // 商品属性参数 + + /** 商品属性参数 */ @Column(name = "result",nullable = false) + @NotBlank private String result; - // 上次修改时间 + + /** 上次修改时间 */ @Column(name = "change_time",nullable = false) + @NotNull private Integer changeTime; + public void copy(YxStoreProductAttrResult source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java index ab57b819..357c6790 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductAttrValue.java @@ -1,16 +1,18 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; -import java.io.Serializable; +import javax.validation.constraints.*; import java.math.BigDecimal; +import java.io.Serializable; /** * @author hupeng -* @date 2019-10-13 +* @date 2020-05-12 */ @Entity @Data @@ -22,39 +24,54 @@ public class YxStoreProductAttrValue implements Serializable { @Column(name = "id") private Integer id; - // 商品ID + + /** 商品ID */ @Column(name = "product_id",nullable = false) + @NotNull private Integer productId; - // 商品属性索引值 (attr_value|attr_value[|....]) + + /** 商品属性索引值 (attr_value|attr_value[|....]) */ @Column(name = "suk",nullable = false) + @NotBlank private String suk; - // 属性对应的库存 + + /** 属性对应的库存 */ @Column(name = "stock",nullable = false) + @NotNull private Integer stock; - // 销量 - @Column(name = "sales",nullable = false) + + /** 销量 */ + @Column(name = "sales") private Integer sales; - // 属性金额 + + /** 属性金额 */ @Column(name = "price",nullable = false) + @NotNull private BigDecimal price; - // 图片 + + /** 图片 */ @Column(name = "image") private String image; - // 唯一值 - @Column(name = "`unique`",nullable = false) + + /** 唯一值 */ + @TableField(value = "`unique`") + @NotBlank private String unique; - // 成本价 + + /** 成本价 */ @Column(name = "cost",nullable = false) + @NotNull private BigDecimal cost; + public void copy(YxStoreProductAttrValue source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java index a8a4a2b1..a5f39b9f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxStoreProductReply.java @@ -1,92 +1,113 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; +import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng -* @date 2019-11-03 +* @date 2020-05-12 */ @Entity @Data @Table(name="yx_store_product_reply") public class YxStoreProductReply implements Serializable { - // 评论ID + /** 评论ID */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Integer id; - // 用户ID -// @Column(name = "uid",nullable = false) -// private Integer uid; - @ManyToOne(fetch=FetchType.LAZY,optional = false) - @JoinColumn(name = "uid") - private YxUser user; + /** 用户ID */ + @Column(name = "uid",nullable = false) + @NotNull + private Integer uid; - // 订单ID + + /** 订单ID */ @Column(name = "oid",nullable = false) + @NotNull private Integer oid; - // 唯一id - @Column(name = "`unique`",nullable = false) + + /** 唯一id */ + @TableField(value = "`unique`") + @NotBlank private String unique; - // 产品id -// @Column(name = "product_id",nullable = false) -// private Integer productId; - @ManyToOne(fetch=FetchType.LAZY,optional = false) - @JoinColumn(name = "product_id") - private YxStoreProduct storeProduct; + /** 产品id */ + @Column(name = "product_id",nullable = false) + @NotNull + private Integer productId; - // 某种商品类型(普通商品、秒杀商品） + + /** 某种商品类型(普通商品、秒杀商品） */ @Column(name = "reply_type",nullable = false) + @NotBlank private String replyType; - // 商品分数 + + /** 商品分数 */ @Column(name = "product_score",nullable = false) + @NotNull private Integer productScore; - // 服务分数 + + /** 服务分数 */ @Column(name = "service_score",nullable = false) + @NotNull private Integer serviceScore; - // 评论内容 + + /** 评论内容 */ @Column(name = "comment",nullable = false) + @NotBlank private String comment; - // 评论图片 + + /** 评论图片 */ @Column(name = "pics",nullable = false) + @NotBlank private String pics; - // 评论时间 + + /** 评论时间 */ @Column(name = "add_time",nullable = false) + @NotNull private Integer addTime; - // 管理员回复内容 + + /** 管理员回复内容 */ @Column(name = "merchant_reply_content") private String merchantReplyContent; - // 管理员回复时间 + + /** 管理员回复时间 */ @Column(name = "merchant_reply_time") private Integer merchantReplyTime; - // 0未删除1已删除 + + /** 0未删除1已删除 */ @Column(name = "is_del",nullable = false) + @NotNull private Integer isDel; - // 0未回复1已回复 + + /** 0未回复1已回复 */ @Column(name = "is_reply",nullable = false) + @NotNull private Integer isReply; + public void copy(YxStoreProductReply source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java index 85139361..482d5419 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemConfig.java @@ -1,44 +1,51 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; +import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng -* @date 2019-10-10 +* @date 2020-05-12 */ @Entity @Data @Table(name="yx_system_config") public class YxSystemConfig implements Serializable { - // 配置id + /** 配置id */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Integer id; - // 字段名称 + + /** 字段名称 */ @Column(name = "menu_name",nullable = false) + @NotBlank private String menuName; - // 默认值 + /** 默认值 */ @Column(name = "value") private String value; - // 排序 - @Column(name = "sort",nullable = false) + + /** 排序 */ + @Column(name = "sort") private Integer sort; - // 是否隐藏 - @Column(name = "status",nullable = false) + + /** 是否隐藏 */ + @Column(name = "status") private Integer status; + public void copy(YxSystemConfig source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java index a2905d5b..64b5dfdd 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemGroupData.java @@ -1,47 +1,59 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; +import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng -* @date 2019-10-18 +* @date 2020-05-12 */ @Entity @Data @Table(name="yx_system_group_data") public class YxSystemGroupData implements Serializable { - // 组合数据详情ID + /** 组合数据详情ID */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Integer id; - // 对应的数据名称 + + /** 对应的数据名称 */ @Column(name = "group_name",nullable = false) + @NotBlank private String groupName; - // 数据组对应的数据值（json数据） + + /** 数据组对应的数据值（json数据） */ @Column(name = "value",nullable = false) + @NotBlank private String value; - // 添加数据时间 + + /** 添加数据时间 */ @Column(name = "add_time",nullable = false) + @NotNull private Integer addTime; - // 数据排序 - @Column(name = "sort",nullable = false) + + /** 数据排序 */ + @Column(name = "sort") private Integer sort; - // 状态（1：开启；2：关闭；） + + /** 状态（1：开启；2：关闭；） */ @Column(name = "status",nullable = false) + @NotNull private Integer status; + public void copy(YxSystemGroupData source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java index a4a9296c..0f6c76fc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStore.java @@ -1,16 +1,17 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; import javax.validation.constraints.*; import java.io.Serializable; -import java.util.Date; /** * @author hupeng -* @date 2020-03-03 +* @date 2020-05-12 */ @Entity @Data @@ -22,80 +23,85 @@ public class YxSystemStore implements Serializable { @Column(name = "id") private Integer id; + /** 门店名称 */ @Column(name = "name",nullable = false) @NotBlank private String name; + /** 简介 */ @Column(name = "introduction",nullable = false) @NotBlank private String introduction; + /** 手机号码 */ @Column(name = "phone",nullable = false) @NotBlank private String phone; + /** 省市区 */ @Column(name = "address",nullable = false) @NotBlank private String address; + /** 详细地址 */ - @Column(name = "detailed_address",insertable = false) + @Column(name = "detailed_address",nullable = false) + @NotBlank private String detailedAddress; + /** 门店logo */ @Column(name = "image",nullable = false) - @NotBlank(message = "请上传门店logo") + @NotBlank private String image; + /** 纬度 */ @Column(name = "latitude",nullable = false) @NotBlank private String latitude; + /** 经度 */ @Column(name = "longitude",nullable = false) @NotBlank private String longitude; + /** 核销有效日期 */ @Column(name = "valid_time",nullable = false) @NotBlank private String validTime; - @Column(name = "valid_time_start",nullable = false) - private Date validTimeStart; - - @Column(name = "valid_time_end",nullable = false) - private Date validTimeEnd; /** 每日营业开关时间 */ @Column(name = "day_time",nullable = false) @NotBlank private String dayTime; - @Column(name = "day_time_start",nullable = false) - private Date dayTimeStart; - - @Column(name = "day_time_end",nullable = false) - private Date dayTimeEnd; /** 添加时间 */ @Column(name = "add_time",nullable = false) + @NotNull private Integer addTime; + /** 是否显示 */ - @Column(name = "is_show") + @Column(name = "is_show",nullable = false) @NotNull private Integer isShow; + /** 是否删除 */ - @Column(name = "is_del",insertable = false) + @Column(name = "is_del",nullable = false) + @NotNull private Integer isDel; + public void copy(YxSystemStore source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java index ed5ec8d0..a354ec30 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemStoreStaff.java @@ -1,6 +1,8 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -9,7 +11,7 @@ import java.io.Serializable; /** * @author hupeng -* @date 2020-03-22 +* @date 2020-05-12 */ @Entity @Data @@ -21,53 +23,64 @@ public class YxSystemStoreStaff implements Serializable { @Column(name = "id") private Integer id; + /** 微信用户id */ @Column(name = "uid",nullable = false) - @NotNull(message = "请选择商城会员") + @NotNull private Integer uid; + /** 店员头像 */ @Column(name = "avatar",nullable = false) - @NotBlank(message = "请选择商城会员") + @NotBlank private String avatar; + /** 门店id */ @Column(name = "store_id",nullable = false) @NotNull private Integer storeId; + /** 店员名称 */ @Column(name = "staff_name",nullable = false) @NotBlank private String staffName; + /** 手机号码 */ @Column(name = "phone",nullable = false) @NotBlank private String phone; + /** 核销开关 */ @Column(name = "verify_status",nullable = false) @NotNull private Integer verifyStatus; + /** 状态 */ - @Column(name = "status",insertable = false) + @Column(name = "status") private Integer status; + /** 添加时间 */ @Column(name = "add_time") private Integer addTime; + /** 微信昵称 */ @Column(name = "nickname",nullable = false) @NotBlank private String nickname; + /** 所属门店 */ @Column(name = "store_name") private String storeName; + public void copy(YxSystemStoreStaff source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java index 1301102b..f79585be 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserLevel.java @@ -1,18 +1,18 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; -import javax.validation.constraints.NotBlank; -import javax.validation.constraints.NotNull; -import java.io.Serializable; +import javax.validation.constraints.*; import java.math.BigDecimal; +import java.io.Serializable; /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ @Entity @Data @@ -24,70 +24,91 @@ public class YxSystemUserLevel implements Serializable { @Column(name = "id") private Integer id; - // 商户id - @Column(name = "mer_id",insertable = false) + + /** 商户id */ + @Column(name = "mer_id",nullable = false) + @NotNull private Integer merId; - // 会员名称 + + /** 会员名称 */ @Column(name = "name",nullable = false) - @NotBlank(message = "请填写等级名称") + @NotBlank private String name; - // 购买金额 - @Column(name = "money",insertable = false) + + /** 购买金额 */ + @Column(name = "money",nullable = false) + @NotNull private BigDecimal money; - // 有效时间 + + /** 有效时间 */ @Column(name = "valid_date",nullable = false) + @NotNull private Integer validDate; - // 是否为永久会员 + + /** 是否为永久会员 */ @Column(name = "is_forever",nullable = false) + @NotNull private Integer isForever; - // 是否购买,1=购买,0=不购买 - @Column(name = "is_pay",insertable = false) + + /** 是否购买,1=购买,0=不购买 */ + @Column(name = "is_pay",nullable = false) + @NotNull private Integer isPay; - // 是否显示 1=显示,0=隐藏 + + /** 是否显示 1=显示,0=隐藏 */ @Column(name = "is_show",nullable = false) - @NotNull(message = "请选择显示状态") + @NotNull private Integer isShow; - // 会员等级 + + /** 会员等级 */ @Column(name = "grade",nullable = false) - @NotNull(message = "等级必填") + @NotNull private Integer grade; - // 享受折扣 + + /** 享受折扣 */ @Column(name = "discount",nullable = false) - @NotNull(message = "折扣必填") + @NotNull private BigDecimal discount; - // 会员卡背景 + /** 会员卡背景 */ @Column(name = "image",nullable = false) - @NotBlank(message = "请上传背景") + @NotBlank private String image; - // 会员图标 + + /** 会员图标 */ @Column(name = "icon",nullable = false) - @NotBlank(message = "请上传图标") + @NotBlank private String icon; - // 说明 - @Column(name = "`explain`",nullable = false) - @NotBlank(message = "请填写说明") + + /** 说明 */ + @TableField(value = "`explain`") + @NotBlank private String explain; - // 添加时间 + + /** 添加时间 */ @Column(name = "add_time",nullable = false) + @NotNull private Integer addTime; - // 是否删除.1=删除,0=未删除 - @Column(name = "is_del",insertable = false) + + /** 是否删除.1=删除,0=未删除 */ + @Column(name = "is_del",nullable = false) + @NotNull private Integer isDel; + public void copy(YxSystemUserLevel source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java index e01e8839..b7fd9f46 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxSystemUserTask.java @@ -1,15 +1,17 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; +import javax.validation.constraints.*; import java.io.Serializable; /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ @Entity @Data @@ -21,46 +23,67 @@ public class YxSystemUserTask implements Serializable { @Column(name = "id") private Integer id; - // 任务名称 + + /** 任务名称 */ @Column(name = "name",nullable = false) + @NotBlank private String name; - // 配置原名 + + /** 配置原名 */ @Column(name = "real_name",nullable = false) + @NotBlank private String realName; - // 任务类型 + + /** 任务类型 */ @Column(name = "task_type",nullable = false) + @NotBlank private String taskType; - // 限定数 + + /** 限定数 */ @Column(name = "number",nullable = false) + @NotNull private Integer number; - // 等级id + + /** 等级id */ @Column(name = "level_id",nullable = false) + @NotNull private Integer levelId; - // 排序 + + /** 排序 */ @Column(name = "sort",nullable = false) + @NotNull private Integer sort; - // 是否显示 + + /** 是否显示 */ @Column(name = "is_show",nullable = false) + @NotNull private Integer isShow; - // 是否务必达成任务,1务必达成,0=满足其一 + + /** 是否务必达成任务,1务必达成,0=满足其一 */ @Column(name = "is_must",nullable = false) + @NotNull private Integer isMust; - // 任务说明 + + /** 任务说明 */ @Column(name = "illustrate",nullable = false) + @NotBlank private String illustrate; - // 新增时间 + + /** 新增时间 */ @Column(name = "add_time",nullable = false) + @NotNull private Integer addTime; + public void copy(YxSystemUserTask source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java index 68886f68..5182761f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUser.java @@ -1,152 +1,212 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; -import java.io.Serializable; +import javax.validation.constraints.*; import java.math.BigDecimal; +import java.io.Serializable; /** * @author hupeng -* @date 2019-10-06 +* @date 2020-05-12 */ @Entity @Data @Table(name="yx_user") public class YxUser implements Serializable { - // 用户id + /** 用户id */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "uid") private Integer uid; - // 用户账号 + + /** 用户账户(跟accout一样) */ + @Column(name = "username") + private String username; + + + /** 用户账号 */ @Column(name = "account",nullable = false) + @NotBlank private String account; - // 用户密码 + + /** 用户密码（跟pwd） */ + @Column(name = "password") + private String password; + + + /** 用户密码 */ @Column(name = "pwd",nullable = false) + @NotBlank private String pwd; - // 真实姓名 - @Column(name = "real_name",nullable = false) + + /** 真实姓名 */ + @Column(name = "real_name") private String realName; - // 生日 - @Column(name = "birthday",nullable = false) + + /** 生日 */ + @Column(name = "birthday") private Integer birthday; - // 身份证号码 - @Column(name = "card_id",nullable = false) + + /** 身份证号码 */ + @Column(name = "card_id") private String cardId; - // 用户备注 - @Column(name = "mark",nullable = false) + + /** 用户备注 */ + @Column(name = "mark") private String mark; - // 合伙人id - @Column(name = "partner_id",nullable = false) + + /** 合伙人id */ + @Column(name = "partner_id") private Integer partnerId; - // 用户分组id - @Column(name = "group_id",nullable = false) + + /** 用户分组id */ + @Column(name = "group_id") private Integer groupId; - // 用户昵称 - @Column(name = "nickname",nullable = false) + + /** 用户昵称 */ + @Column(name = "nickname") private String nickname; - // 用户头像 - @Column(name = "avatar",nullable = false) + + /** 用户头像 */ + @Column(name = "avatar") private String avatar; - // 手机号码 + + /** 手机号码 */ @Column(name = "phone") private String phone; - // 添加时间 + + /** 添加时间 */ @Column(name = "add_time",nullable = false) + @NotNull private Integer addTime; - // 添加ip - @Column(name = "add_ip",nullable = false) + + /** 添加ip */ + @Column(name = "add_ip") private String addIp; - // 最后一次登录时间 + + /** 最后一次登录时间 */ @Column(name = "last_time",nullable = false) + @NotNull private Integer lastTime; - // 最后一次登录ip - @Column(name = "last_ip",nullable = false) + + /** 最后一次登录ip */ + @Column(name = "last_ip") private String lastIp; - // 用户余额 + + /** 用户余额 */ @Column(name = "now_money",nullable = false) + @NotNull private BigDecimal nowMoney; - // 佣金金额 + + /** 佣金金额 */ @Column(name = "brokerage_price",nullable = false) + @NotNull private BigDecimal brokeragePrice; - // 用户剩余积分 + + /** 用户剩余积分 */ @Column(name = "integral",nullable = false) + @NotNull private BigDecimal integral; - // 连续签到天数 + + /** 连续签到天数 */ @Column(name = "sign_num",nullable = false) + @NotNull private Integer signNum; - // 1为正常，0为禁止 + + /** 1为正常，0为禁止 */ @Column(name = "status",nullable = false) + @NotNull private Integer status; - // 等级 + + /** 等级 */ @Column(name = "level",nullable = false) + @NotNull private Integer level; - // 推广元id + + /** 推广元id */ @Column(name = "spread_uid",nullable = false) + @NotNull private Integer spreadUid; - // 推广员关联时间 + + /** 推广员关联时间 */ @Column(name = "spread_time",nullable = false) + @NotNull private Integer spreadTime; - // 用户类型 + + /** 用户类型 */ @Column(name = "user_type",nullable = false) + @NotBlank private String userType; - // 是否为推广员 + + /** 是否为推广员 */ @Column(name = "is_promoter",nullable = false) + @NotNull private Integer isPromoter; - // 用户购买次数 + + /** 用户购买次数 */ @Column(name = "pay_count") private Integer payCount; - // 下级人数 + + /** 下级人数 */ @Column(name = "spread_count") private Integer spreadCount; - // 清理会员时间 + + /** 清理会员时间 */ @Column(name = "clean_time") private Integer cleanTime; - // 详细地址 + + /** 详细地址 */ @Column(name = "addres",nullable = false) + @NotBlank private String addres; - // 管理员编号 + + /** 管理员编号 */ @Column(name = "adminid") private Integer adminid; - // 用户登陆类型，h5,wechat,routine + + /** 用户登陆类型，h5,wechat,routine */ @Column(name = "login_type",nullable = false) + @NotBlank private String loginType; + public void copy(YxUser source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java index b6c79fb6..c2a8e01f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserBill.java @@ -1,74 +1,97 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; -import java.io.Serializable; +import javax.validation.constraints.*; import java.math.BigDecimal; +import java.io.Serializable; /** * @author hupeng -* @date 2019-11-06 +* @date 2020-05-12 */ @Entity @Data @Table(name="yx_user_bill") public class YxUserBill implements Serializable { - // 用户账单id + /** 用户账单id */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "id") private Integer id; - //用户uid + + /** 用户uid */ @Column(name = "uid",nullable = false) + @NotNull private Integer uid; - - // 关联id + /** 关联id */ @Column(name = "link_id",nullable = false) + @NotBlank private String linkId; - // 0 = 支出 1 = 获得 + + /** 0 = 支出 1 = 获得 */ @Column(name = "pm",nullable = false) + @NotNull private Integer pm; - // 账单标题 + + /** 账单标题 */ @Column(name = "title",nullable = false) + @NotBlank private String title; - // 明细种类 + + /** 明细种类 */ @Column(name = "category",nullable = false) + @NotBlank private String category; - // 明细类型 + + /** 明细类型 */ @Column(name = "type",nullable = false) + @NotBlank private String type; - // 明细数字 + + /** 明细数字 */ @Column(name = "number",nullable = false) + @NotNull private BigDecimal number; - // 剩余 + + /** 剩余 */ @Column(name = "balance",nullable = false) + @NotNull private BigDecimal balance; - // 备注 + + /** 备注 */ @Column(name = "mark",nullable = false) + @NotBlank private String mark; - // 添加时间 + + /** 添加时间 */ @Column(name = "add_time",nullable = false) + @NotNull private Integer addTime; - // 0 = 带确定 1 = 有效 -1 = 无效 + + /** 0 = 带确定 1 = 有效 -1 = 无效 */ @Column(name = "status",nullable = false) + @NotNull private Integer status; + public void copy(YxUserBill source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java index 3de16b39..007ac682 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxUserRecharge.java @@ -1,6 +1,8 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; import javax.persistence.*; @@ -10,7 +12,7 @@ import java.io.Serializable; /** * @author hupeng -* @date 2020-03-02 +* @date 2020-05-12 */ @Entity @Data @@ -22,42 +24,52 @@ public class YxUserRecharge implements Serializable { @Column(name = "id") private Integer id; + /** 充值用户UID */ @Column(name = "uid") private Integer uid; + /** 订单号 */ @Column(name = "order_id",unique = true) private String orderId; + /** 充值金额 */ @Column(name = "price") private BigDecimal price; + /** 充值类型 */ @Column(name = "recharge_type") private String rechargeType; + /** 是否充值 */ @Column(name = "paid") private Integer paid; + /** 充值支付时间 */ @Column(name = "pay_time") private Integer payTime; + /** 充值时间 */ @Column(name = "add_time") private Integer addTime; + /** 退款金额 */ @Column(name = "refund_price") private BigDecimal refundPrice; + /** 昵称 */ @Column(name = "nickname") private String nickname; + public void copy(YxUserRecharge source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java index 0be5a22b..61cf60c3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/domain/YxWechatUser.java @@ -1,120 +1,153 @@ package co.yixiang.modules.shop.domain; - +import com.baomidou.mybatisplus.annotation.TableLogic; +import lombok.Data; +import com.baomidou.mybatisplus.annotation.FieldFill; +import com.baomidou.mybatisplus.annotation.TableField; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.bean.copier.CopyOptions; -import lombok.Data; - import javax.persistence.*; -import java.io.Serializable; +import javax.validation.constraints.*; import java.math.BigDecimal; +import java.io.Serializable; /** * @author hupeng -* @date 2019-12-13 +* @date 2020-05-12 */ @Entity @Data @Table(name="yx_wechat_user") public class YxWechatUser implements Serializable { - // 微信用户id + /** 微信用户id */ @Id @GeneratedValue(strategy = GenerationType.IDENTITY) @Column(name = "uid") private Integer uid; - // 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段 + + /** 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段 */ @Column(name = "unionid") private String unionid; - // 用户的标识，对当前公众号唯一 - @Column(name = "openid") + + /** 用户的标识，对当前公众号唯一 */ + @Column(name = "openid",unique = true) private String openid; - // 小程序唯一身份ID + + /** 小程序唯一身份ID */ @Column(name = "routine_openid") private String routineOpenid; - // 用户的昵称 + + /** 用户的昵称 */ @Column(name = "nickname",nullable = false) + @NotBlank private String nickname; - // 用户头像 + + /** 用户头像 */ @Column(name = "headimgurl",nullable = false) + @NotBlank private String headimgurl; - // 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知 + + /** 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知 */ @Column(name = "sex",nullable = false) + @NotNull private Integer sex; - // 用户所在城市 + + /** 用户所在城市 */ @Column(name = "city",nullable = false) + @NotBlank private String city; - // 用户的语言，简体中文为zh_CN + + /** 用户的语言，简体中文为zh_CN */ @Column(name = "language",nullable = false) + @NotBlank private String language; - // 用户所在省份 + + /** 用户所在省份 */ @Column(name = "province",nullable = false) + @NotBlank private String province; - // 用户所在国家 + + /** 用户所在国家 */ @Column(name = "country",nullable = false) + @NotBlank private String country; - // 公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注 + + /** 公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注 */ @Column(name = "remark") private String remark; - // 用户所在的分组ID（兼容旧的用户分组接口） + + /** 用户所在的分组ID（兼容旧的用户分组接口） */ @Column(name = "groupid") private Integer groupid; - // 用户被打上的标签ID列表 + + /** 用户被打上的标签ID列表 */ @Column(name = "tagid_list") private String tagidList; - // 用户是否订阅该公众号标识 + + /** 用户是否订阅该公众号标识 */ @Column(name = "subscribe") private Integer subscribe; - // 关注公众号时间 + + /** 关注公众号时间 */ @Column(name = "subscribe_time") private Integer subscribeTime; - // 添加时间 + + /** 添加时间 */ @Column(name = "add_time") private Integer addTime; - // 一级推荐人 + + /** 一级推荐人 */ @Column(name = "stair") private Integer stair; - // 二级推荐人 + + /** 二级推荐人 */ @Column(name = "second") private Integer second; - // 一级推荐人订单 + + /** 一级推荐人订单 */ @Column(name = "order_stair") private Integer orderStair; - // 二级推荐人订单 + + /** 二级推荐人订单 */ @Column(name = "order_second") private Integer orderSecond; - // 佣金 + + /** 佣金 */ @Column(name = "now_money") private BigDecimal nowMoney; - // 小程序用户会话密匙 + + /** 小程序用户会话密匙 */ @Column(name = "session_key") private String sessionKey; - // 用户类型 + + /** 用户类型 */ @Column(name = "user_type") private String userType; + public void copy(YxWechatUser source){ BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true)); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxExpressRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxExpressRepository.java deleted file mode 100644 index 790ce6f4..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxExpressRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxExpress; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-12-12 -*/ -public interface YxExpressRepository extends JpaRepository, JpaSpecificationExecutor { - - /** - * findByCode - * @param code - * @return - */ - YxExpress findByCode(String code); -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxMaterialGroupRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxMaterialGroupRepository.java deleted file mode 100644 index 63bfae82..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxMaterialGroupRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxMaterialGroup; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2020-01-09 -*/ -public interface YxMaterialGroupRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxMaterialRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxMaterialRepository.java deleted file mode 100644 index aa661856..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxMaterialRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxMaterial; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2020-01-09 -*/ -public interface YxMaterialRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCartRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCartRepository.java deleted file mode 100644 index fe154ab1..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCartRepository.java +++ /dev/null @@ -1,21 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxStoreCart; -import co.yixiang.modules.shop.service.dto.CountDto; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Query; -import java.util.List; - -/** - * @author xwb - * @date 2020-04-02 - */ -public interface YxStoreCartRepository extends JpaRepository, JpaSpecificationExecutor { - - @Query(value ="SELECT t.cate_name as catename from yx_store_cart c " + - "LEFT JOIN yx_store_product p on c.product_id = p.id " + - "LEFT JOIN yx_store_category t on p.cate_id = t.id " + - "WHERE c.is_pay = 1",nativeQuery = true) - List findCateName(); -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java deleted file mode 100644 index f68317aa..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreCategoryRepository.java +++ /dev/null @@ -1,23 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxStoreCategory; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; - -/** -* @author hupeng -* @date 2019-10-03 -*/ -public interface YxStoreCategoryRepository extends JpaRepository, JpaSpecificationExecutor { - @Query(value = "select cate_name from yx_store_category where id = ?1",nativeQuery = true) - String findNameById(Integer id); - - @Modifying - @Query("update YxStoreCategory s set s.isDel = 1 where s.id =:id") - void delCategory(Integer id); - - YxStoreCategory findByPid(Integer pid); - -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderCartInfoRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderCartInfoRepository.java deleted file mode 100644 index 5c4bd8f8..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderCartInfoRepository.java +++ /dev/null @@ -1,17 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.StoreOrderCartInfo; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -import java.util.List; - -/** -* @author hupeng -* @date 2019-10-14 -*/ -public interface YxStoreOrderCartInfoRepository extends JpaRepository, JpaSpecificationExecutor { - - List findByOid(int oid); - -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderRepository.java deleted file mode 100644 index f351a4a0..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderRepository.java +++ /dev/null @@ -1,59 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxStoreOrder; -import co.yixiang.modules.shop.service.dto.ChartDataDTO; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Query; - -import java.util.List; - -/** -* @author hupeng -* @date 2019-10-14 -*/ -public interface YxStoreOrderRepository extends JpaRepository, JpaSpecificationExecutor { - - - //今天 //上周 //本月 - int countByPayTimeGreaterThanEqual(int time); - - //昨天 - int countByPayTimeLessThanAndPayTimeGreaterThanEqual(int timeO, int timeT); - - @Query(value = "select IFNULL(sum(pay_price),0) from yx_store_order " + - "where refund_status=0 and is_del=0 and paid=1 and pay_time >= ?1",nativeQuery = true) - double sumPrice(Integer time); - - @Query(value = "select IFNULL(sum(pay_price),0) from yx_store_order " + - "where refund_status=0 and is_del=0 and paid=1",nativeQuery = true) - double sumTotalPrice(); - - @Query(value = "select IFNULL(sum(pay_price),0) from yx_store_order " + - "where refund_status=0 and is_del=0 and paid=1 and pay_time >= ?1 and pay_time < ?2",nativeQuery = true) - double sumTPrice(Integer timeO, Integer timeT); - - @Query(value = "SELECT IFNULL(sum(pay_price),0) as num," + - "FROM_UNIXTIME(add_time, '%m-%d') as time " + - " FROM yx_store_order where refund_status=0 and is_del=0 and paid=1 and pay_time >= ?1" + - " GROUP BY FROM_UNIXTIME(add_time,'%Y-%m-%d') " + - " ORDER BY add_time ASC",nativeQuery = true) - List chartList(Integer time); - - @Query(value = "SELECT count(id) as num," + - "FROM_UNIXTIME(add_time, '%m-%d') as time " + - " FROM yx_store_order where refund_status=0 and is_del=0 and paid=1 and pay_time >= ?1" + - " GROUP BY FROM_UNIXTIME(add_time,'%Y-%m-%d') " + - " ORDER BY add_time ASC",nativeQuery = true) - List chartListT(Integer time); - - - /** - * findByUnique - * @param unique - * @return - */ - YxStoreOrder findByUnique(String unique); - - List findByOrderIdIn(List ids); -} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderStatusRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderStatusRepository.java deleted file mode 100644 index 0b49b039..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreOrderStatusRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxStoreOrderStatus; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-11-02 -*/ -public interface YxStoreOrderStatusRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java deleted file mode 100644 index bf1b5694..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrRepository.java +++ /dev/null @@ -1,19 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxStoreProductAttr; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Query; - -/** -* @author hupeng -* @date 2019-10-13 -*/ -public interface YxStoreProductAttrRepository extends JpaRepository, JpaSpecificationExecutor { - //@Modifying - //@Query(value = "delete from yx_store_product_attr where product_id =?1",nativeQuery = true) - void deleteByProductId(int id); - - - -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrResultRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrResultRepository.java deleted file mode 100644 index da334e7b..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrResultRepository.java +++ /dev/null @@ -1,21 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxStoreProductAttrResult; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-10-13 -*/ -public interface YxStoreProductAttrResultRepository extends JpaRepository, JpaSpecificationExecutor { - - /** - * findByProductId - * @param product_id - * @return - */ - YxStoreProductAttrResult findByProductId(Integer product_id); - - void deleteByProductId(Integer product_id); -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrValueRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrValueRepository.java deleted file mode 100644 index d1bfd89f..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductAttrValueRepository.java +++ /dev/null @@ -1,21 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Query; - -/** -* @author hupeng -* @date 2019-10-13 -*/ -public interface YxStoreProductAttrValueRepository extends JpaRepository, JpaSpecificationExecutor { - - //@Modifying - // @Query(value = "delete from yx_store_product_attr_value where product_id =?1",nativeQuery = true) - void deleteByProductId(Integer id); - - @Query(value = "select sum(stock) from yx_store_product_attr_value " + - "where product_id = ?1",nativeQuery = true) - Integer sumStock(Integer productId); -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductReplyRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductReplyRepository.java deleted file mode 100644 index 5767dd82..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductReplyRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxStoreProductReply; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-11-03 -*/ -public interface YxStoreProductReplyRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductRepository.java deleted file mode 100644 index 596e027d..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxStoreProductRepository.java +++ /dev/null @@ -1,26 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxStoreCategory; -import co.yixiang.modules.shop.domain.YxStoreProduct; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; - -import java.util.List; - -/** -* @author hupeng -* @date 2019-10-04 -*/ -public interface YxStoreProductRepository extends JpaRepository, JpaSpecificationExecutor { - @Modifying - @Query(value = "update yx_store_product set is_show = ?1 where id = ?2",nativeQuery = true) - void updateOnsale(int status, int id); - - @Modifying - @Query(value = "update yx_store_product set is_del = ?1 where id = ?2",nativeQuery = true) - void updateDel(int status, int id); - - List findByStoreCategoryAndIsDel(YxStoreCategory storeCategory,int isDel); -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemConfigRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemConfigRepository.java deleted file mode 100644 index fa0ea74f..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemConfigRepository.java +++ /dev/null @@ -1,13 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxSystemConfig; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-10-10 -*/ -public interface YxSystemConfigRepository extends JpaRepository, JpaSpecificationExecutor { - YxSystemConfig findByMenuName(String str); -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemGroupDataRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemGroupDataRepository.java deleted file mode 100644 index 86144a06..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemGroupDataRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxSystemGroupData; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-10-18 -*/ -public interface YxSystemGroupDataRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemStoreRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemStoreRepository.java deleted file mode 100644 index 609bf8dc..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemStoreRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxSystemStore; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2020-03-03 -*/ -public interface YxSystemStoreRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemStoreStaffRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemStoreStaffRepository.java deleted file mode 100644 index 6482a3cb..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemStoreStaffRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxSystemStoreStaff; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2020-03-22 -*/ -public interface YxSystemStoreStaffRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserLevelRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserLevelRepository.java deleted file mode 100644 index d79b81d3..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserLevelRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxSystemUserLevel; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-12-04 -*/ -public interface YxSystemUserLevelRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserTaskRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserTaskRepository.java deleted file mode 100644 index ea128cb2..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxSystemUserTaskRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxSystemUserTask; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-12-04 -*/ -public interface YxSystemUserTaskRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserBillRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserBillRepository.java deleted file mode 100644 index c2cb7850..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserBillRepository.java +++ /dev/null @@ -1,28 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxUserBill; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Query; - -import java.util.Map; - -/** -* @author hupeng -* @date 2019-11-06 -*/ -public interface YxUserBillRepository extends JpaRepository, JpaSpecificationExecutor { - @Query(nativeQuery = true, - value = "select b.title,b.pm,b.category,b.type,b.number,b.add_time as addTime," + - "u.nickname from yx_user_bill b left join yx_user u on u.uid=b.uid " + - " where if(?1 !='',b.category=?1,1=1) and if(?2 !='',b.type=?2,1=1) " + - "and if(?3 !='',u.nickname LIKE CONCAT('%',?3,'%'),1=1) order by b.id desc", - countQuery = "select count(*) from yx_user_bill b left join yx_user u on u.uid=b.uid" + - " where if(?1 !='',b.category=?1,1=1) and if(?2 !='',b.type=?2,1=1) " + - "and if(?3 !='',u.nickname LIKE CONCAT('%',?3,'%'),1=1)") - Page findAllByPageable(String category, String type, String nickname, - Pageable pageable); - -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserRechargeRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserRechargeRepository.java deleted file mode 100644 index f267c33b..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserRechargeRepository.java +++ /dev/null @@ -1,18 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxUserRecharge; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2020-03-02 -*/ -public interface YxUserRechargeRepository extends JpaRepository, JpaSpecificationExecutor { - /** - * 根据 OrderId 查询 - * @param order_id / - * @return / - */ - YxUserRecharge findByOrderId(String order_id); -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserRepository.java deleted file mode 100644 index fd748747..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxUserRepository.java +++ /dev/null @@ -1,30 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxUser; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; -import org.springframework.data.jpa.repository.Modifying; -import org.springframework.data.jpa.repository.Query; - -/** -* @author hupeng -* @date 2019-10-06 -*/ -public interface YxUserRepository extends JpaRepository, JpaSpecificationExecutor { - - @Modifying - @Query(value = "update yx_user set status = ?1 where uid = ?2",nativeQuery = true) - void updateOnstatus(int status, int id); - - @Modifying - @Query(value = "update yx_user set now_money = now_money + ?1 where uid = ?2",nativeQuery = true) - void updateMoney(double money, int id); - - @Modifying - @Query(value = "update yx_user set brokerage_price = brokerage_price+?1 where uid = ?2",nativeQuery = true) - void incBrokeragePrice(double price, int id); - - - - -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxWechatUserRepository.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxWechatUserRepository.java deleted file mode 100644 index 48617120..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/repository/YxWechatUserRepository.java +++ /dev/null @@ -1,12 +0,0 @@ -package co.yixiang.modules.shop.repository; - -import co.yixiang.modules.shop.domain.YxWechatUser; -import org.springframework.data.jpa.repository.JpaRepository; -import org.springframework.data.jpa.repository.JpaSpecificationExecutor; - -/** -* @author hupeng -* @date 2019-12-13 -*/ -public interface YxWechatUserRepository extends JpaRepository, JpaSpecificationExecutor { -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java index bf955c37..c1efdca6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/ExpressController.java @@ -45,7 +45,7 @@ public class ExpressController { @PreAuthorize("@el.check('admin','YXEXPRESS_ALL','YXEXPRESS_CREATE')") public ResponseEntity create(@Validated @RequestBody YxExpress resources){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - return new ResponseEntity(yxExpressService.create(resources),HttpStatus.CREATED); + return new ResponseEntity(yxExpressService.save(resources),HttpStatus.CREATED); } @Log("修改快递") @@ -54,7 +54,7 @@ public class ExpressController { @PreAuthorize("@el.check('admin','YXEXPRESS_ALL','YXEXPRESS_EDIT')") public ResponseEntity update(@Validated @RequestBody YxExpress resources){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxExpressService.update(resources); + yxExpressService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -64,7 +64,7 @@ public class ExpressController { @PreAuthorize("@el.check('admin','YXEXPRESS_ALL','YXEXPRESS_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxExpressService.delete(id); + yxExpressService.removeById(id); return new ResponseEntity(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java index 0187d7ea..21b136aa 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialController.java @@ -43,14 +43,14 @@ public class MaterialController { @ApiOperation("新增素材管理") public ResponseEntity create(@Validated @RequestBody YxMaterial resources){ resources.setCreateId(SecurityUtils.getUsername()); - return new ResponseEntity<>(yxMaterialService.create(resources),HttpStatus.CREATED); + return new ResponseEntity<>(yxMaterialService.save(resources),HttpStatus.CREATED); } @PutMapping @Log("修改素材管理") @ApiOperation("修改素材管理") public ResponseEntity update(@Validated @RequestBody YxMaterial resources){ - yxMaterialService.update(resources); + yxMaterialService.saveOrUpdate(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -58,9 +58,9 @@ public class MaterialController { @ApiOperation("删除素材管理") @DeleteMapping(value = "/{id}") public ResponseEntity deleteAll(@PathVariable String id) { - yxMaterialService.deleteById(id); + yxMaterialService.removeById(id); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java index 521c59a7..8a662c1b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MaterialGroupController.java @@ -40,14 +40,14 @@ public class MaterialGroupController { @Log("新增素材分组") @ApiOperation("新增素材分组") public ResponseEntity create(@Validated @RequestBody YxMaterialGroup resources){ - return new ResponseEntity<>(yxMaterialGroupService.create(resources),HttpStatus.CREATED); + return new ResponseEntity<>(yxMaterialGroupService.save(resources),HttpStatus.CREATED); } @PutMapping @Log("修改素材分组") @ApiOperation("修改素材分组") public ResponseEntity update(@Validated @RequestBody YxMaterialGroup resources){ - yxMaterialGroupService.update(resources); + yxMaterialGroupService.saveOrUpdate(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -55,7 +55,7 @@ public class MaterialGroupController { @ApiOperation("删除素材分组") @DeleteMapping(value = "/{id}") public ResponseEntity deleteAll(@PathVariable String id) { - yxMaterialGroupService.deleteById(id); + yxMaterialGroupService.removeById(id); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MemberController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MemberController.java index 3bec5abe..19ef426c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MemberController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/MemberController.java @@ -59,7 +59,7 @@ public class MemberController { @PostMapping(value = "/yxUser") @PreAuthorize("@el.check('admin','YXUSER_ALL','YXUSER_CREATE')") public ResponseEntity create(@Validated @RequestBody YxUser resources){ - return new ResponseEntity(yxUserService.create(resources),HttpStatus.CREATED); + return new ResponseEntity(yxUserService.save(resources),HttpStatus.CREATED); } @Log("修改用户") @@ -67,7 +67,7 @@ public class MemberController { @PutMapping(value = "/yxUser") @PreAuthorize("@el.check('admin','YXUSER_ALL','YXUSER_EDIT')") public ResponseEntity update(@Validated @RequestBody YxUser resources){ - yxUserService.update(resources); + yxUserService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -77,7 +77,7 @@ public class MemberController { @PreAuthorize("@el.check('admin','YXUSER_ALL','YXUSER_DELETE')") public ResponseEntity delete(@PathVariable Integer uid){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxUserService.delete(uid); + yxUserService.removeById(uid); return new ResponseEntity(HttpStatus.OK); } @@ -99,4 +99,4 @@ public class MemberController { return new ResponseEntity(HttpStatus.NO_CONTENT); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java index 5137f19e..5a327d10 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreCategoryController.java @@ -5,7 +5,7 @@ import co.yixiang.aop.log.Log; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxStoreCategory; import co.yixiang.modules.shop.service.YxStoreCategoryService; -import co.yixiang.modules.shop.service.dto.YxStoreCategoryDTO; +import co.yixiang.modules.shop.service.dto.YxStoreCategoryDto; import co.yixiang.modules.shop.service.dto.YxStoreCategoryQueryCriteria; import co.yixiang.utils.OrderUtil; import io.swagger.annotations.Api; @@ -53,7 +53,7 @@ public class StoreCategoryController { @PreAuthorize("@el.check('admin','YXSTORECATEGORY_ALL','YXSTORECATEGORY_SELECT')") public ResponseEntity getYxStoreCategorys(YxStoreCategoryQueryCriteria criteria, Pageable pageable){ - List categoryDTOList = yxStoreCategoryService.queryAll(criteria); + List categoryDTOList = yxStoreCategoryService.queryAll(criteria); return new ResponseEntity(yxStoreCategoryService.buildTree(categoryDTOList),HttpStatus.OK); } @@ -68,7 +68,7 @@ public class StoreCategoryController { } resources.setAddTime(OrderUtil.getSecondTimestampTwo()); - return new ResponseEntity(yxStoreCategoryService.create(resources),HttpStatus.CREATED); + return new ResponseEntity(yxStoreCategoryService.save(resources),HttpStatus.CREATED); } @Log("修改商品分类") @@ -80,7 +80,7 @@ public class StoreCategoryController { if(resources.getPid() > 0 && StrUtil.isBlank(resources.getPic())) { throw new BadRequestException("子分类图片必传"); } - yxStoreCategoryService.update(resources); + yxStoreCategoryService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -92,8 +92,8 @@ public class StoreCategoryController { //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); String[] ids = id.split(","); for (String newId: ids) { - yxStoreCategoryService.delete(Integer.valueOf(newId)); + yxStoreCategoryService.removeById(Integer.valueOf(newId)); } return new ResponseEntity(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java index e40bbfa0..e7b39b6c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreOrderController.java @@ -7,20 +7,18 @@ import cn.hutool.core.util.StrUtil; import co.yixiang.annotation.AnonymousAccess; import co.yixiang.aop.log.Log; import co.yixiang.constant.ShopConstants; +import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.OrderInfoEnum; import co.yixiang.exception.BadRequestException; import co.yixiang.express.ExpressService; import co.yixiang.express.dao.ExpressInfo; import co.yixiang.modules.activity.service.YxStorePinkService; -import co.yixiang.modules.activity.service.dto.YxStorePinkDTO; import co.yixiang.modules.shop.domain.YxStoreOrder; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; import co.yixiang.modules.shop.service.*; import co.yixiang.modules.shop.service.dto.*; import co.yixiang.modules.shop.service.param.ExpressParam; -import co.yixiang.mp.service.WxMpTemplateMessageService; import co.yixiang.mp.service.YxTemplateService; -import co.yixiang.mp.service.YxWechatTemplateService; import co.yixiang.utils.OrderUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONArray; @@ -41,10 +39,7 @@ import org.springframework.web.client.RestTemplate; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.text.MessageFormat; import java.text.ParseException; -import java.util.ArrayList; -import java.util.Arrays; import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; @@ -62,29 +57,28 @@ public class StoreOrderController { @Value("${yshop.apiUrl}") private String apiUrl; - + private final IGenerator generator; private final YxStoreOrderService yxStoreOrderService; private final YxStoreOrderStatusService yxStoreOrderStatusService; private final YxExpressService yxExpressService; private final YxWechatUserService wechatUserService; private final RedisTemplate redisTemplate; private final YxTemplateService templateService; - private final YxStorePinkService storePinkService; private final ExpressService expressService; - public StoreOrderController(YxStoreOrderService yxStoreOrderService, YxStoreOrderStatusService yxStoreOrderStatusService, + public StoreOrderController(IGenerator generator, YxStoreOrderService yxStoreOrderService, YxStoreOrderStatusService yxStoreOrderStatusService, YxExpressService yxExpressService, YxWechatUserService wechatUserService, RedisTemplate redisTemplate, - YxTemplateService templateService,YxStorePinkService storePinkService, + YxTemplateService templateService, YxStorePinkService storePinkService, ExpressService expressService) { + this.generator = generator; this.yxStoreOrderService = yxStoreOrderService; this.yxStoreOrderStatusService = yxStoreOrderStatusService; this.yxExpressService = yxExpressService; this.wechatUserService = wechatUserService; this.redisTemplate = redisTemplate; this.templateService = templateService; - this.storePinkService = storePinkService; this.expressService = expressService; } @@ -203,8 +197,8 @@ public class StoreOrderController { public ResponseEntity update(@Validated @RequestBody YxStoreOrder resources) { if (StrUtil.isBlank(resources.getDeliveryName())) throw new BadRequestException("请选择快递公司"); if (StrUtil.isBlank(resources.getDeliveryId())) throw new BadRequestException("快递单号不能为空"); - YxExpressDTO expressDTO = yxExpressService.findById(Integer.valueOf(resources - .getDeliveryName())); + YxExpressDto expressDTO = generator.convert(yxExpressService.getById(Integer.valueOf(resources + .getDeliveryName())),YxExpressDto.class); if (ObjectUtil.isNull(expressDTO)) { throw new BadRequestException("请先添加快递公司"); } @@ -222,11 +216,11 @@ public class StoreOrderController { + " 快递单号：" + resources.getDeliveryId()); storeOrderStatus.setChangeTime(OrderUtil.getSecondTimestampTwo()); - yxStoreOrderStatusService.create(storeOrderStatus); + yxStoreOrderStatusService.save(storeOrderStatus); //模板消息通知 try { - YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid()); + YxWechatUserDto wechatUser = generator.convert(wechatUserService.getById(resources.getUid()),YxWechatUserDto.class); if (ObjectUtil.isNotNull(wechatUser)) { //公众号与小程序打通统一公众号模板通知 if (StrUtil.isNotBlank(wechatUser.getOpenid())) { @@ -253,7 +247,7 @@ public class StoreOrderController { @PreAuthorize("@el.check('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity check(@Validated @RequestBody YxStoreOrder resources) { if (StrUtil.isBlank(resources.getVerifyCode())) throw new BadRequestException("核销码不能为空"); - YxStoreOrderDTO storeOrderDTO = yxStoreOrderService.findById(resources.getId()); + YxStoreOrderDto storeOrderDTO = generator.convert(yxStoreOrderService.getById(resources.getId()),YxStoreOrderDto.class); if(!resources.getVerifyCode().equals(storeOrderDTO.getVerifyCode())){ throw new BadRequestException("核销码不对"); } @@ -297,7 +291,7 @@ public class StoreOrderController { //模板消息通知 try { - YxWechatUserDTO wechatUser = wechatUserService.findById(resources.getUid()); + YxWechatUserDto wechatUser = generator.convert(wechatUserService.getById(resources.getUid()),YxWechatUserDto.class); if (ObjectUtil.isNotNull(wechatUser)) { //公众号与小程序打通统一公众号模板通知 if (StrUtil.isNotBlank(wechatUser.getOpenid())) { @@ -321,7 +315,7 @@ public class StoreOrderController { @PreAuthorize("@el.check('admin','YXSTOREORDER_ALL','YXSTOREORDER_DELETE')") public ResponseEntity delete(@PathVariable Integer id) { //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxStoreOrderService.delete(id); + yxStoreOrderService.removeById(id); return new ResponseEntity(HttpStatus.OK); } @@ -334,7 +328,7 @@ public class StoreOrderController { if (ObjectUtil.isNull(resources.getPayPrice())) throw new BadRequestException("请输入支付金额"); if (resources.getPayPrice().doubleValue() < 0) throw new BadRequestException("金额不能低于0"); - YxStoreOrderDTO storeOrder = yxStoreOrderService.findById(resources.getId()); + YxStoreOrderDto storeOrder = generator.convert(yxStoreOrderService.getById(resources.getId()),YxStoreOrderDto.class); //判断金额是否有变动,生成一个额外订单号去支付 int res = NumberUtil.compare(storeOrder.getPayPrice().doubleValue(), resources.getPayPrice().doubleValue()); @@ -344,7 +338,7 @@ public class StoreOrderController { } - yxStoreOrderService.update(resources); + yxStoreOrderService.saveOrUpdate(resources); YxStoreOrderStatus storeOrderStatus = new YxStoreOrderStatus(); storeOrderStatus.setOid(resources.getId()); @@ -352,7 +346,7 @@ public class StoreOrderController { storeOrderStatus.setChangeMessage("修改订单价格为：" + resources.getPayPrice()); storeOrderStatus.setChangeTime(OrderUtil.getSecondTimestampTwo()); - yxStoreOrderStatusService.create(storeOrderStatus); + yxStoreOrderStatusService.save(storeOrderStatus); return new ResponseEntity(HttpStatus.OK); } @@ -362,7 +356,7 @@ public class StoreOrderController { @PreAuthorize("hasAnyRole('admin','YXSTOREORDER_ALL','YXSTOREORDER_EDIT')") public ResponseEntity editOrderRemark(@RequestBody YxStoreOrder resources) { if (StrUtil.isBlank(resources.getRemark())) throw new BadRequestException("请输入备注"); - yxStoreOrderService.update(resources); + yxStoreOrderService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.OK); } @@ -389,7 +383,7 @@ public class StoreOrderController { @RequestParam(name = "orderStatus") String orderStatus, @RequestParam(name = "orderType") String orderType, @RequestParam(name = "listContent") String listContent) throws IOException, ParseException { - List list; + List list; if(StringUtils.isEmpty(listContent)){ list = (List)getYxStoreList(criteria, pageable, orderStatus, orderType).get("content"); }else { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java index 5e2e5bc1..eed42543 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductController.java @@ -56,7 +56,7 @@ public class StoreProductController { resources.setAddTime(OrderUtil.getSecondTimestampTwo()); if(ObjectUtil.isEmpty(resources.getGiveIntegral())) resources.setGiveIntegral(BigDecimal.ZERO); if(ObjectUtil.isEmpty(resources.getCost())) resources.setCost(BigDecimal.ZERO); - return new ResponseEntity(yxStoreProductService.create(resources),HttpStatus.CREATED); + return new ResponseEntity(yxStoreProductService.save(resources),HttpStatus.CREATED); } @Log("修改商品") @@ -66,7 +66,7 @@ public class StoreProductController { @PreAuthorize("@el.check('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreProduct resources){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxStoreProductService.update(resources); + yxStoreProductService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -77,7 +77,7 @@ public class StoreProductController { @PreAuthorize("@el.check('admin','YXSTOREPRODUCT_ALL','YXSTOREPRODUCT_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxStoreProductService.delete(id); + yxStoreProductService.removeById(id); return new ResponseEntity(HttpStatus.OK); } @@ -136,4 +136,4 @@ public class StoreProductController { -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductReplyController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductReplyController.java index e767cd85..7e8cf64f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductReplyController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/StoreProductReplyController.java @@ -47,7 +47,7 @@ public class StoreProductReplyController { @PutMapping(value = "/yxStoreProductReply") @PreAuthorize("@el.check('admin','YXSTOREPRODUCTREPLY_ALL','YXSTOREPRODUCTREPLY_EDIT')") public ResponseEntity update(@Validated @RequestBody YxStoreProductReply resources){ - yxStoreProductReplyService.update(resources); + yxStoreProductReplyService.save(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -60,7 +60,7 @@ public class StoreProductReplyController { YxStoreProductReply reply = new YxStoreProductReply(); reply.setIsDel(1); reply.setId(id); - yxStoreProductReplyService.update(reply); + yxStoreProductReplyService.saveOrUpdate(reply); return new ResponseEntity(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java index c7ee7854..fe173b1b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemConfigController.java @@ -14,6 +14,7 @@ import co.yixiang.mp.config.WxPayConfiguration; import co.yixiang.utils.RedisUtil; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.cache.annotation.CacheEvict; @@ -56,7 +57,7 @@ public class SystemConfigController { JSONObject jsonObject = JSON.parseObject(jsonStr); jsonObject.forEach( (key,value)->{ - YxSystemConfig yxSystemConfig = yxSystemConfigService.findByKey(key); + YxSystemConfig yxSystemConfig = yxSystemConfigService.getOne(new QueryWrapper().eq("key",key)); YxSystemConfig yxSystemConfigModel = new YxSystemConfig(); yxSystemConfigModel.setMenuName(key); yxSystemConfigModel.setValue(value.toString()); @@ -70,10 +71,10 @@ public class SystemConfigController { } RedisUtil.set(key,value.toString(),0); if(ObjectUtil.isNull(yxSystemConfig)){ - yxSystemConfigService.create(yxSystemConfigModel); + yxSystemConfigService.save(yxSystemConfigModel); }else{ yxSystemConfigModel.setId(yxSystemConfig.getId()); - yxSystemConfigService.update(yxSystemConfigModel); + yxSystemConfigService.saveOrUpdate(yxSystemConfigModel); } } ); diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java index 391c79ed..33c84b3d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemGroupDataController.java @@ -93,7 +93,7 @@ public class SystemGroupDataController { yxSystemGroupData.setSort(jsonObject.getInteger("sort")); yxSystemGroupData.setAddTime(OrderUtil.getSecondTimestampTwo()); - return new ResponseEntity(yxSystemGroupDataService.create(yxSystemGroupData),HttpStatus.CREATED); + return new ResponseEntity(yxSystemGroupDataService.save(yxSystemGroupData),HttpStatus.CREATED); } @Log("修改数据配置") @@ -141,7 +141,7 @@ public class SystemGroupDataController { yxSystemGroupData.setId(Integer.valueOf(jsonObject.get("id").toString())); - yxSystemGroupDataService.update(yxSystemGroupData); + yxSystemGroupDataService.saveOrUpdate(yxSystemGroupData); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -151,7 +151,7 @@ public class SystemGroupDataController { @PreAuthorize("@el.check('admin','YXSYSTEMGROUPDATA_ALL','YXSYSTEMGROUPDATA_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxSystemGroupDataService.delete(id); + yxSystemGroupDataService.removeById(id); return new ResponseEntity(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java index ac017bb7..05ba4143 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreController.java @@ -4,10 +4,12 @@ import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import co.yixiang.aop.log.Log; import co.yixiang.constant.ShopConstants; +import co.yixiang.dozer.service.IGenerator; import co.yixiang.enums.RedisKeyEnum; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxSystemStore; import co.yixiang.modules.shop.service.YxSystemStoreService; +import co.yixiang.modules.shop.service.dto.YxSystemStoreDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreQueryCriteria; import co.yixiang.utils.OrderUtil; import co.yixiang.utils.RedisUtil; @@ -24,6 +26,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; /** * @author hupeng @@ -35,9 +39,10 @@ import java.io.IOException; public class SystemStoreController { private final YxSystemStoreService yxSystemStoreService; - - public SystemStoreController(YxSystemStoreService yxSystemStoreService) { + private final IGenerator generator; + public SystemStoreController(YxSystemStoreService yxSystemStoreService, IGenerator generator) { this.yxSystemStoreService = yxSystemStoreService; + this.generator = generator; } @@ -54,7 +59,7 @@ public class SystemStoreController { @GetMapping(value = "/download") @PreAuthorize("@el.check('yxSystemStore:list')") public void download(HttpServletResponse response, YxSystemStoreQueryCriteria criteria) throws IOException { - yxSystemStoreService.download(yxSystemStoreService.queryAll(criteria), response); + yxSystemStoreService.download(generator.convert(yxSystemStoreService.queryAll(criteria), YxSystemStoreDto.class), response); } @GetMapping @@ -86,7 +91,7 @@ public class SystemStoreController { public ResponseEntity create(@Validated @RequestBody YxSystemStore resources){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); resources.setAddTime(OrderUtil.getSecondTimestampTwo()); - return new ResponseEntity<>(yxSystemStoreService.create(resources),HttpStatus.CREATED); + return new ResponseEntity<>(yxSystemStoreService.save(resources),HttpStatus.CREATED); } @PutMapping @@ -95,7 +100,7 @@ public class SystemStoreController { @PreAuthorize("@el.check('yxSystemStore:edit')") public ResponseEntity update(@Validated @RequestBody YxSystemStore resources){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxSystemStoreService.update(resources); + yxSystemStoreService.saveOrUpdate(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -105,7 +110,7 @@ public class SystemStoreController { @DeleteMapping public ResponseEntity deleteAll(@RequestBody Integer[] ids) { //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxSystemStoreService.deleteAll(ids); + yxSystemStoreService.removeByIds(new ArrayList<>(Arrays.asList(ids))); return new ResponseEntity<>(HttpStatus.OK); } } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java index 5a7ab5a5..3d2b7c17 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemStoreStaffController.java @@ -1,10 +1,10 @@ package co.yixiang.modules.shop.rest; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; +import co.yixiang.dozer.service.IGenerator; import co.yixiang.modules.shop.domain.YxSystemStoreStaff; import co.yixiang.modules.shop.service.YxSystemStoreStaffService; +import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffQueryCriteria; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; /** * @author hupeng @@ -29,8 +31,11 @@ public class SystemStoreStaffController { private final YxSystemStoreStaffService yxSystemStoreStaffService; - public SystemStoreStaffController(YxSystemStoreStaffService yxSystemStoreStaffService) { + private final IGenerator generator; + + public SystemStoreStaffController(YxSystemStoreStaffService yxSystemStoreStaffService, IGenerator generator) { this.yxSystemStoreStaffService = yxSystemStoreStaffService; + this.generator = generator; } @Log("导出数据") @@ -38,7 +43,7 @@ public class SystemStoreStaffController { @GetMapping(value = "/download") @PreAuthorize("@el.check('yxSystemStoreStaff:list')") public void download(HttpServletResponse response, YxSystemStoreStaffQueryCriteria criteria) throws IOException { - yxSystemStoreStaffService.download(yxSystemStoreStaffService.queryAll(criteria), response); + yxSystemStoreStaffService.download(generator.convert(yxSystemStoreStaffService.queryAll(criteria), YxSystemStoreStaffDto.class), response); } @GetMapping @@ -54,7 +59,7 @@ public class SystemStoreStaffController { @ApiOperation("新增门店店员") @PreAuthorize("@el.check('yxSystemStoreStaff:add')") public ResponseEntity create(@Validated @RequestBody YxSystemStoreStaff resources){ - return new ResponseEntity<>(yxSystemStoreStaffService.create(resources),HttpStatus.CREATED); + return new ResponseEntity<>(yxSystemStoreStaffService.save(resources),HttpStatus.CREATED); } @PutMapping @@ -62,7 +67,7 @@ public class SystemStoreStaffController { @ApiOperation("修改门店店员") @PreAuthorize("@el.check('yxSystemStoreStaff:edit')") public ResponseEntity update(@Validated @RequestBody YxSystemStoreStaff resources){ - yxSystemStoreStaffService.update(resources); + yxSystemStoreStaffService.saveOrUpdate(resources); return new ResponseEntity<>(HttpStatus.NO_CONTENT); } @@ -72,7 +77,7 @@ public class SystemStoreStaffController { @DeleteMapping public ResponseEntity deleteAll(@RequestBody Integer[] ids) { //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxSystemStoreStaffService.deleteAll(ids); + yxSystemStoreStaffService.removeByIds(new ArrayList<>(Arrays.asList(ids))); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserLevelController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserLevelController.java index e0bd7d35..f8219c52 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserLevelController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserLevelController.java @@ -16,6 +16,9 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; +import java.util.ArrayList; +import java.util.Arrays; + /** * @author hupeng * @date 2019-12-04 @@ -46,7 +49,7 @@ public class SystemUserLevelController { public ResponseEntity create(@Validated @RequestBody YxSystemUserLevel resources){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); resources.setAddTime(OrderUtil.getSecondTimestampTwo()); - return new ResponseEntity(yxSystemUserLevelService.create(resources),HttpStatus.CREATED); + return new ResponseEntity(yxSystemUserLevelService.save(resources),HttpStatus.CREATED); } @Log("修改") @@ -55,7 +58,7 @@ public class SystemUserLevelController { @PreAuthorize("@el.check('admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_EDIT')") public ResponseEntity update(@Validated @RequestBody YxSystemUserLevel resources){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxSystemUserLevelService.update(resources); + yxSystemUserLevelService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -65,7 +68,7 @@ public class SystemUserLevelController { @PreAuthorize("@el.check('admin','YXSYSTEMUSERLEVEL_ALL','YXSYSTEMUSERLEVEL_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxSystemUserLevelService.delete(id); + yxSystemUserLevelService.removeById(id); return new ResponseEntity(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserTaskController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserTaskController.java index 7e7c7d00..8e7886c7 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserTaskController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/SystemUserTaskController.java @@ -39,7 +39,7 @@ public class SystemUserTaskController { @PreAuthorize("@el.check('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_SELECT')") public ResponseEntity getYxSystemUserTasks(YxSystemUserTaskQueryCriteria criteria, Pageable pageable){ - Sort sort = new Sort(Sort.Direction.ASC, "levelId"); + Sort sort = new Sort(Sort.Direction.ASC, "level_id"); Pageable pageableT = PageRequest.of(pageable.getPageNumber(), pageable.getPageSize(), sort); @@ -52,7 +52,7 @@ public class SystemUserTaskController { @PostMapping(value = "/yxSystemUserTask") @PreAuthorize("@el.check('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_CREATE')") public ResponseEntity create(@Validated @RequestBody YxSystemUserTask resources){ - return new ResponseEntity(yxSystemUserTaskService.create(resources),HttpStatus.CREATED); + return new ResponseEntity(yxSystemUserTaskService.save(resources),HttpStatus.CREATED); } @Log("修改") @@ -61,7 +61,7 @@ public class SystemUserTaskController { @PreAuthorize("@el.check('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_EDIT')") public ResponseEntity update(@Validated @RequestBody YxSystemUserTask resources){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxSystemUserTaskService.update(resources); + yxSystemUserTaskService.saveOrUpdate(resources); return new ResponseEntity(HttpStatus.NO_CONTENT); } @@ -71,7 +71,7 @@ public class SystemUserTaskController { @PreAuthorize("@el.check('admin','YXSYSTEMUSERTASK_ALL','YXSYSTEMUSERTASK_DELETE')") public ResponseEntity delete(@PathVariable Integer id){ //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxSystemUserTaskService.delete(id); + yxSystemUserTaskService.removeById(id); return new ResponseEntity(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java index 1283431d..00d8e7bf 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/UserRechargeController.java @@ -1,10 +1,10 @@ package co.yixiang.modules.shop.rest; -import cn.hutool.core.util.StrUtil; import co.yixiang.aop.log.Log; -import co.yixiang.exception.BadRequestException; +import co.yixiang.dozer.service.IGenerator; import co.yixiang.modules.shop.domain.YxUserRecharge; import co.yixiang.modules.shop.service.YxUserRechargeService; +import co.yixiang.modules.shop.service.dto.YxUserRechargeDto; import co.yixiang.modules.shop.service.dto.YxUserRechargeQueryCriteria; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -17,6 +17,8 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; +import java.util.ArrayList; +import java.util.Arrays; /** * @author hupeng @@ -28,9 +30,10 @@ import java.io.IOException; public class UserRechargeController { private final YxUserRechargeService yxUserRechargeService; - - public UserRechargeController(YxUserRechargeService yxUserRechargeService) { + private final IGenerator generator; + public UserRechargeController(YxUserRechargeService yxUserRechargeService, IGenerator generator) { this.yxUserRechargeService = yxUserRechargeService; + this.generator = generator; } @Log("导出数据") @@ -38,7 +41,7 @@ public class UserRechargeController { @GetMapping(value = "/download") @PreAuthorize("@el.check('yxUserRecharge:list')") public void download(HttpServletResponse response, YxUserRechargeQueryCriteria criteria) throws IOException { - yxUserRechargeService.download(yxUserRechargeService.queryAll(criteria), response); + yxUserRechargeService.download(generator.convert(yxUserRechargeService.queryAll(criteria), YxUserRechargeDto.class), response); } @GetMapping @@ -54,7 +57,7 @@ public class UserRechargeController { @ApiOperation("新增充值管理") @PreAuthorize("@el.check('yxUserRecharge:add')") public ResponseEntity create(@Validated @RequestBody YxUserRecharge resources){ - return new ResponseEntity<>(yxUserRechargeService.create(resources),HttpStatus.CREATED); + return new ResponseEntity<>(yxUserRechargeService.save(resources),HttpStatus.CREATED); } @@ -65,7 +68,7 @@ public class UserRechargeController { @DeleteMapping public ResponseEntity deleteAll(@RequestBody Integer[] ids) { //if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作"); - yxUserRechargeService.deleteAll(ids); + yxUserRechargeService.removeByIds(new ArrayList<>(Arrays.asList(ids))); return new ResponseEntity<>(HttpStatus.OK); } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxWechatUserController.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxWechatUserController.java new file mode 100644 index 00000000..7084a840 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/rest/YxWechatUserController.java @@ -0,0 +1,77 @@ +package co.yixiang.modules.shop.rest; +import java.util.Arrays; +import co.yixiang.dozer.service.IGenerator; +import lombok.AllArgsConstructor; +import co.yixiang.aop.log.Log; +import co.yixiang.modules.shop.domain.YxWechatUser; +import co.yixiang.modules.shop.service.YxWechatUserService; +import co.yixiang.modules.shop.service.dto.YxWechatUserQueryCriteria; +import co.yixiang.modules.shop.service.dto.YxWechatUserDto; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; +import io.swagger.annotations.*; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@AllArgsConstructor +@Api(tags = "微信用户管理") +@RestController +@RequestMapping("/api/yxWechatUser") +public class YxWechatUserController { + + private final YxWechatUserService yxWechatUserService; + private final IGenerator generator; + + + @Log("导出数据") + @ApiOperation("导出数据") + @GetMapping(value = "/download") + @PreAuthorize("@el.check('admin','yxWechatUser:list')") + public void download(HttpServletResponse response, YxWechatUserQueryCriteria criteria) throws IOException { + yxWechatUserService.download(generator.convert(yxWechatUserService.queryAll(criteria), YxWechatUserDto.class), response); + } + + @GetMapping + @Log("查询微信用户") + @ApiOperation("查询微信用户") + @PreAuthorize("@el.check('admin','yxWechatUser:list')") + public ResponseEntity getYxWechatUsers(YxWechatUserQueryCriteria criteria, Pageable pageable){ + return new ResponseEntity<>(yxWechatUserService.queryAll(criteria,pageable),HttpStatus.OK); + } + + @PostMapping + @Log("新增微信用户") + @ApiOperation("新增微信用户") + @PreAuthorize("@el.check('admin','yxWechatUser:add')") + public ResponseEntity create(@Validated @RequestBody YxWechatUser resources){ + return new ResponseEntity<>(yxWechatUserService.save(resources),HttpStatus.CREATED); + } + + @PutMapping + @Log("修改微信用户") + @ApiOperation("修改微信用户") + @PreAuthorize("@el.check('admin','yxWechatUser:edit')") + public ResponseEntity update(@Validated @RequestBody YxWechatUser resources){ + yxWechatUserService.updateById(resources); + return new ResponseEntity<>(HttpStatus.NO_CONTENT); + } + + @Log("删除微信用户") + @ApiOperation("删除微信用户") + @PreAuthorize("@el.check('admin','yxWechatUser:del')") + @DeleteMapping + public ResponseEntity deleteAll(@RequestBody Integer[] ids) { + Arrays.asList(ids).forEach(id->{ + yxWechatUserService.removeById(id); + }); + return new ResponseEntity<>(HttpStatus.OK); + } +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java index 8402477d..b47cac08 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxExpressService.java @@ -1,64 +1,40 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxExpress; -import co.yixiang.modules.shop.service.dto.YxExpressDTO; +import co.yixiang.modules.shop.service.dto.YxExpressDto; import co.yixiang.modules.shop.service.dto.YxExpressQueryCriteria; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-12-12 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxExpress") -public interface YxExpressService { +public interface YxExpressService extends BaseService{ - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxExpressQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxExpressQueryCriteria criteria); + List queryAll(YxExpressQueryCriteria criteria); /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxExpressDTO findById(Integer id); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxExpressDTO create(YxExpress resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxExpress resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialGroupService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialGroupService.java index 355e73a7..a5d914d3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialGroupService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialGroupService.java @@ -1,5 +1,5 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxMaterialGroup; import co.yixiang.modules.shop.service.dto.YxMaterialGroupDto; import co.yixiang.modules.shop.service.dto.YxMaterialGroupQueryCriteria; @@ -11,11 +11,11 @@ import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ -public interface YxMaterialGroupService { +public interface YxMaterialGroupService extends BaseService{ - /** +/** * 查询数据分页 * @param criteria 条件 * @param pageable 分页参数 @@ -28,35 +28,13 @@ public interface YxMaterialGroupService { * @param criteria 条件参数 * @return List */ - List queryAll(YxMaterialGroupQueryCriteria criteria); + List queryAll(YxMaterialGroupQueryCriteria criteria); /** - * 根据ID查询 - * @param id ID - * @return YxMaterialGroupDto - */ - YxMaterialGroupDto findById(String id); - - /** - * 创建 - * @param resources / - * @return YxMaterialGroupDto + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / */ - YxMaterialGroupDto create(YxMaterialGroup resources); - - /** - * 编辑 - * @param resources / - */ - void update(YxMaterialGroup resources); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(String[] ids); - - void deleteById(String id); - - + void download(List all, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialService.java index 15ffbb9f..216a7081 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxMaterialService.java @@ -1,5 +1,5 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxMaterial; import co.yixiang.modules.shop.service.dto.YxMaterialDto; import co.yixiang.modules.shop.service.dto.YxMaterialQueryCriteria; @@ -11,11 +11,11 @@ import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ -public interface YxMaterialService { +public interface YxMaterialService extends BaseService{ - /** +/** * 查询数据分页 * @param criteria 条件 * @param pageable 分页参数 @@ -28,36 +28,13 @@ public interface YxMaterialService { * @param criteria 条件参数 * @return List */ - List queryAll(YxMaterialQueryCriteria criteria); + List queryAll(YxMaterialQueryCriteria criteria); /** - * 根据ID查询 - * @param id ID - * @return YxMaterialDto - */ - YxMaterialDto findById(String id); - - /** - * 创建 - * @param resources / - * @return YxMaterialDto + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / */ - YxMaterialDto create(YxMaterial resources); - - /** - * 编辑 - * @param resources / - */ - void update(YxMaterial resources); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(String[] ids); - - void deleteById(String id); - - - + void download(List all, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCartService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCartService.java new file mode 100644 index 00000000..c7901fc3 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCartService.java @@ -0,0 +1,43 @@ +package co.yixiang.modules.shop.service; +import co.yixiang.common.service.BaseService; +import co.yixiang.modules.shop.domain.YxStoreCart; +import co.yixiang.modules.shop.service.dto.CountDto; +import co.yixiang.modules.shop.service.dto.YxStoreCartDto; +import co.yixiang.modules.shop.service.dto.YxStoreCartQueryCriteria; +import org.springframework.data.domain.Pageable; +import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +public interface YxStoreCartService extends BaseService{ + +/** + * 查询数据分页 + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map + */ + Map queryAll(YxStoreCartQueryCriteria criteria, Pageable pageable); + + /** + * 查询所有数据不分页 + * @param criteria 条件参数 + * @return List + */ + List queryAll(YxStoreCartQueryCriteria criteria); + + /** + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; + + List findCateName(); +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java index 0e87e93e..d03bea1e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreCategoryService.java @@ -1,80 +1,42 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreCategory; -import co.yixiang.modules.shop.service.dto.YxStoreCategoryDTO; +import co.yixiang.modules.shop.service.dto.YxStoreCategoryDto; import co.yixiang.modules.shop.service.dto.YxStoreCategoryQueryCriteria; import org.springframework.data.domain.Pageable; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-10-03 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxStoreCategory") -public interface YxStoreCategoryService { +public interface YxStoreCategoryService extends BaseService{ - /** - * 导出数据 - * @param queryAll 待导出的数据 - * @param response / - * @throws IOException / - */ - void download(List queryAll, HttpServletResponse response) throws IOException; - - - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxStoreCategoryQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxStoreCategoryQueryCriteria criteria); + List queryAll(YxStoreCategoryQueryCriteria criteria); /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxStoreCategoryDTO findById(Integer id); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; - YxStoreCategoryDTO findByName(String name); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxStoreCategoryDTO create(YxStoreCategory resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxStoreCategory resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); - - Object buildTree(List categoryDTOS); - -} \ No newline at end of file + Object buildTree(List categoryDTOList); +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderCartInfoService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderCartInfoService.java new file mode 100644 index 00000000..22d2f7ce --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderCartInfoService.java @@ -0,0 +1,40 @@ +package co.yixiang.modules.shop.service; +import co.yixiang.common.service.BaseService; +import co.yixiang.modules.shop.domain.YxStoreOrderCartInfo; +import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoDto; +import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoQueryCriteria; +import org.springframework.data.domain.Pageable; +import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +public interface YxStoreOrderCartInfoService extends BaseService{ + +/** + * 查询数据分页 + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map + */ + Map queryAll(YxStoreOrderCartInfoQueryCriteria criteria, Pageable pageable); + + /** + * 查询所有数据不分页 + * @param criteria 条件参数 + * @return List + */ + List queryAll(YxStoreOrderCartInfoQueryCriteria criteria); + + /** + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java index cbcf2632..36db04bc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderService.java @@ -1,85 +1,61 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreOrder; import co.yixiang.modules.shop.service.dto.OrderCountDto; import co.yixiang.modules.shop.service.dto.OrderTimeDataDTO; -import co.yixiang.modules.shop.service.dto.YxStoreOrderDTO; +import co.yixiang.modules.shop.service.dto.YxStoreOrderDto; import co.yixiang.modules.shop.service.dto.YxStoreOrderQueryCriteria; import org.springframework.data.domain.Pageable; -import java.text.ParseException; - -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-10-14 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxStoreOrder") -public interface YxStoreOrderService { +public interface YxStoreOrderService extends BaseService{ + +/** + * 查询数据分页 + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map + */ + Map queryAll(YxStoreOrderQueryCriteria criteria, Pageable pageable); + + /** + * 查询所有数据不分页 + * @param criteria 条件参数 + * @return List + */ + List queryAll(YxStoreOrderQueryCriteria criteria); + + + YxStoreOrderDto create(YxStoreOrder resources); + + void update(YxStoreOrder resources); + /** + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; + + + Map queryAll(List ids); + + + String orderType(int id,int pinkId, int combinationId,int seckillId, + int bargainId,int shippingType); + + void refund(YxStoreOrder resources); OrderCountDto getOrderCount(); OrderTimeDataDTO getOrderTimeData(); Map chartCount(); - - String orderType(int id, int pinkId, int combinationId, int seckillId,int bargainId,int shippingType); - - void refund(YxStoreOrder resources); - - void download(List queryAll, HttpServletResponse response) throws IOException, ParseException; - - - /** - * 查询数据分页 - * @param criteria - * @param pageable - * @return - */ - //@Cacheable - Map queryAll(YxStoreOrderQueryCriteria criteria, Pageable pageable); - - /** - * 查询所有数据不分页 - * @param criteria - * @return - */ - //@Cacheable - List queryAll(YxStoreOrderQueryCriteria criteria); - - /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxStoreOrderDTO findById(Integer id); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxStoreOrderDTO create(YxStoreOrder resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxStoreOrder resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); - - - Map queryAll(List ids); } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java index 49ec7711..73f768a4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreOrderStatusService.java @@ -1,64 +1,40 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; -import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusDTO; +import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusDto; import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusQueryCriteria; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-11-02 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxStoreOrderStatus") -public interface YxStoreOrderStatusService { +public interface YxStoreOrderStatusService extends BaseService{ - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxStoreOrderStatusQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxStoreOrderStatusQueryCriteria criteria); + List queryAll(YxStoreOrderStatusQueryCriteria criteria); /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxStoreOrderStatusDTO findById(Integer id); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxStoreOrderStatusDTO create(YxStoreOrderStatus resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxStoreOrderStatus resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrResultService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrResultService.java new file mode 100644 index 00000000..383486e6 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrResultService.java @@ -0,0 +1,16 @@ +package co.yixiang.modules.shop.service; +import co.yixiang.common.service.BaseService; +import co.yixiang.modules.shop.domain.YxStoreProductAttrResult; +import org.springframework.data.domain.Pageable; +import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +public interface YxStoreProductAttrResultService extends BaseService{ + +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrService.java new file mode 100644 index 00000000..cca08ba8 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrService.java @@ -0,0 +1,16 @@ +package co.yixiang.modules.shop.service; +import co.yixiang.common.service.BaseService; +import co.yixiang.modules.shop.domain.YxStoreProductAttr; +import org.springframework.data.domain.Pageable; +import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +public interface YxStoreProductAttrService extends BaseService{ + +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrValueService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrValueService.java new file mode 100644 index 00000000..1df0868a --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductAttrValueService.java @@ -0,0 +1,16 @@ +package co.yixiang.modules.shop.service; +import co.yixiang.common.service.BaseService; +import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; +import org.springframework.data.domain.Pageable; +import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +public interface YxStoreProductAttrValueService extends BaseService{ + +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java index 163f23a2..868f20de 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductReplyService.java @@ -1,64 +1,40 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreProductReply; -import co.yixiang.modules.shop.service.dto.YxStoreProductReplyDTO; +import co.yixiang.modules.shop.service.dto.YxStoreProductReplyDto; import co.yixiang.modules.shop.service.dto.YxStoreProductReplyQueryCriteria; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-11-03 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxStoreProductReply") -public interface YxStoreProductReplyService { +public interface YxStoreProductReplyService extends BaseService{ - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxStoreProductReplyQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxStoreProductReplyQueryCriteria criteria); + List queryAll(YxStoreProductReplyQueryCriteria criteria); /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxStoreProductReplyDTO findById(Integer id); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxStoreProductReplyDTO create(YxStoreProductReply resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxStoreProductReply resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java index 1a848429..4c1e1042 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxStoreProductService.java @@ -1,79 +1,55 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxStoreProduct; import co.yixiang.modules.shop.service.dto.ProductFormatDTO; -import co.yixiang.modules.shop.service.dto.YxStoreProductDTO; +import co.yixiang.modules.shop.service.dto.YxStoreProductDto; import co.yixiang.modules.shop.service.dto.YxStoreProductQueryCriteria; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-10-04 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxStoreProduct") -public interface YxStoreProductService { +public interface YxStoreProductService extends BaseService{ - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxStoreProductQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxStoreProductQueryCriteria criteria); + List queryAll(YxStoreProductQueryCriteria criteria); /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxStoreProductDTO findById(Integer id); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxStoreProductDTO create(YxStoreProduct resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxStoreProduct resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; void recovery(Integer id); - void onSale(Integer id, Integer status); + void onSale(Integer id, int status); List isFormatAttr(Integer id, String jsonStr); void createProductAttr(Integer id, String jsonStr); - void setResult(Map map, Integer id); + void clearProductAttr(Integer id,boolean isActice); - void clearProductAttr(Integer id, boolean isActice); + void setResult(Map map,Integer id); String getStoreProductAttrResult(Integer id); -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java index 26084cae..297834c5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemConfigService.java @@ -1,66 +1,43 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemConfig; -import co.yixiang.modules.shop.service.dto.YxSystemConfigDTO; +import co.yixiang.modules.shop.service.dto.YxSystemConfigDto; import co.yixiang.modules.shop.service.dto.YxSystemConfigQueryCriteria; +import co.yixiang.utils.AliPayStatusEnum; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-10-10 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxSystemConfig") -public interface YxSystemConfigService { +public interface YxSystemConfigService extends BaseService{ - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxSystemConfigQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxSystemConfigQueryCriteria criteria); + List queryAll(YxSystemConfigQueryCriteria criteria); /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxSystemConfigDTO findById(Integer id); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxSystemConfigDTO create(YxSystemConfig resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxSystemConfig resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); - - YxSystemConfig findByKey(String str); -} \ No newline at end of file + YxSystemConfig findByKey(String store_brokerage_statu); +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java index 1df46faa..60de9026 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemGroupDataService.java @@ -1,64 +1,40 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemGroupData; -import co.yixiang.modules.shop.service.dto.YxSystemGroupDataDTO; +import co.yixiang.modules.shop.service.dto.YxSystemGroupDataDto; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataQueryCriteria; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-10-18 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxSystemGroupData") -public interface YxSystemGroupDataService { +public interface YxSystemGroupDataService extends BaseService{ - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxSystemGroupDataQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxSystemGroupDataQueryCriteria criteria); + List queryAll(YxSystemGroupDataQueryCriteria criteria); /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxSystemGroupDataDTO findById(Integer id); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxSystemGroupDataDTO create(YxSystemGroupData resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxSystemGroupData resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java index a4a885eb..392a2d3a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreService.java @@ -1,5 +1,5 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemStore; import co.yixiang.modules.shop.service.dto.YxSystemStoreDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreQueryCriteria; @@ -11,11 +11,11 @@ import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2020-03-03 +* @date 2020-05-12 */ -public interface YxSystemStoreService { +public interface YxSystemStoreService extends BaseService{ - /** +/** * 查询数据分页 * @param criteria 条件 * @param pageable 分页参数 @@ -28,33 +28,7 @@ public interface YxSystemStoreService { * @param criteria 条件参数 * @return List */ - List queryAll(YxSystemStoreQueryCriteria criteria); - - /** - * 根据ID查询 - * @param id ID - * @return YxSystemStoreDto - */ - YxSystemStoreDto findById(Integer id); - - /** - * 创建 - * @param resources / - * @return YxSystemStoreDto - */ - YxSystemStoreDto create(YxSystemStore resources); - - /** - * 编辑 - * @param resources / - */ - void update(YxSystemStore resources); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Integer[] ids); + List queryAll(YxSystemStoreQueryCriteria criteria); /** * 导出数据 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java index d294afa4..3daac195 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemStoreStaffService.java @@ -1,5 +1,5 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemStoreStaff; import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffQueryCriteria; @@ -11,11 +11,11 @@ import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2020-03-22 +* @date 2020-05-12 */ -public interface YxSystemStoreStaffService { +public interface YxSystemStoreStaffService extends BaseService{ - /** +/** * 查询数据分页 * @param criteria 条件 * @param pageable 分页参数 @@ -28,33 +28,7 @@ public interface YxSystemStoreStaffService { * @param criteria 条件参数 * @return List */ - List queryAll(YxSystemStoreStaffQueryCriteria criteria); - - /** - * 根据ID查询 - * @param id ID - * @return YxSystemStoreStaffDto - */ - YxSystemStoreStaffDto findById(Integer id); - - /** - * 创建 - * @param resources / - * @return YxSystemStoreStaffDto - */ - YxSystemStoreStaffDto create(YxSystemStoreStaff resources); - - /** - * 编辑 - * @param resources / - */ - void update(YxSystemStoreStaff resources); - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Integer[] ids); + List queryAll(YxSystemStoreStaffQueryCriteria criteria); /** * 导出数据 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java index 4fd8de0a..5f0904cd 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserLevelService.java @@ -1,64 +1,40 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemUserLevel; -import co.yixiang.modules.shop.service.dto.YxSystemUserLevelDTO; +import co.yixiang.modules.shop.service.dto.YxSystemUserLevelDto; import co.yixiang.modules.shop.service.dto.YxSystemUserLevelQueryCriteria; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxSystemUserLevel") -public interface YxSystemUserLevelService { +public interface YxSystemUserLevelService extends BaseService{ - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxSystemUserLevelQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxSystemUserLevelQueryCriteria criteria); + List queryAll(YxSystemUserLevelQueryCriteria criteria); /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxSystemUserLevelDTO findById(Integer id); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxSystemUserLevelDTO create(YxSystemUserLevel resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxSystemUserLevel resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java index 17af5fe7..44d52bf3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxSystemUserTaskService.java @@ -1,66 +1,40 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxSystemUserTask; -import co.yixiang.modules.shop.service.dto.YxSystemUserTaskDTO; +import co.yixiang.modules.shop.service.dto.YxSystemUserTaskDto; import co.yixiang.modules.shop.service.dto.YxSystemUserTaskQueryCriteria; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxSystemUserTask") -public interface YxSystemUserTaskService { +public interface YxSystemUserTaskService extends BaseService{ - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxSystemUserTaskQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxSystemUserTaskQueryCriteria criteria); + List queryAll(YxSystemUserTaskQueryCriteria criteria); /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxSystemUserTaskDTO findById(Integer id); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxSystemUserTaskDTO create(YxSystemUserTask resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxSystemUserTask resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); - - List> getTaskType(); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java index eff5574b..4015727b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserBillService.java @@ -1,64 +1,40 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxUserBill; -import co.yixiang.modules.shop.service.dto.YxUserBillDTO; +import co.yixiang.modules.shop.service.dto.YxUserBillDto; import co.yixiang.modules.shop.service.dto.YxUserBillQueryCriteria; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-11-06 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxUserBill") -public interface YxUserBillService { +public interface YxUserBillService extends BaseService{ - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxUserBillQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxUserBillQueryCriteria criteria); + List queryAll(YxUserBillQueryCriteria criteria); /** - * 根据ID查询 - * @param id - * @return - */ - //@Cacheable(key = "#p0") - YxUserBillDTO findById(Integer id); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxUserBillDTO create(YxUserBill resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxUserBill resources); - - /** - * 删除 - * @param id - */ - //@CacheEvict(allEntries = true) - void delete(Integer id); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserRechargeService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserRechargeService.java index 91551e92..3f0bed7e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserRechargeService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserRechargeService.java @@ -1,5 +1,5 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxUserRecharge; import co.yixiang.modules.shop.service.dto.YxUserRechargeDto; import co.yixiang.modules.shop.service.dto.YxUserRechargeQueryCriteria; @@ -11,11 +11,11 @@ import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2020-03-02 +* @date 2020-05-12 */ -public interface YxUserRechargeService { +public interface YxUserRechargeService extends BaseService{ - /** +/** * 查询数据分页 * @param criteria 条件 * @param pageable 分页参数 @@ -28,29 +28,7 @@ public interface YxUserRechargeService { * @param criteria 条件参数 * @return List */ - List queryAll(YxUserRechargeQueryCriteria criteria); - - /** - * 根据ID查询 - * @param id ID - * @return YxUserRechargeDto - */ - YxUserRechargeDto findById(Integer id); - - /** - * 创建 - * @param resources / - * @return YxUserRechargeDto - */ - YxUserRechargeDto create(YxUserRecharge resources); - - - - /** - * 多选删除 - * @param ids / - */ - void deleteAll(Integer[] ids); + List queryAll(YxUserRechargeQueryCriteria criteria); /** * 导出数据 diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserService.java index 06d868da..ca105278 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxUserService.java @@ -1,71 +1,47 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxUser; import co.yixiang.modules.shop.service.dto.UserMoneyDTO; -import co.yixiang.modules.shop.service.dto.YxUserDTO; +import co.yixiang.modules.shop.service.dto.YxUserDto; import co.yixiang.modules.shop.service.dto.YxUserQueryCriteria; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-10-06 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxUser") -public interface YxUserService { +public interface YxUserService extends BaseService{ - void updateMoney(UserMoneyDTO param); - - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxUserQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxUserQueryCriteria criteria); + List queryAll(YxUserQueryCriteria criteria); /** - * 根据ID查询 - * @param uid - * @return - */ - //@Cacheable(key = "#p0") - YxUserDTO findById(Integer uid); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxUserDTO create(YxUser resources); + void onStatus(Integer id, int status); - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxUser resources); + void updateMoney(UserMoneyDTO param); - /** - * 删除 - * @param uid - */ - //@CacheEvict(allEntries = true) - void delete(Integer uid); - - void onStatus(Integer uid, Integer status); - - void incBrokeragePrice(double price, int uid); -} \ No newline at end of file + void incBrokeragePrice(double doubleValue, Integer uid); +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxWechatUserService.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxWechatUserService.java index c21a2293..664d1876 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxWechatUserService.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/YxWechatUserService.java @@ -1,64 +1,40 @@ package co.yixiang.modules.shop.service; - +import co.yixiang.common.service.BaseService; import co.yixiang.modules.shop.domain.YxWechatUser; -import co.yixiang.modules.shop.service.dto.YxWechatUserDTO; +import co.yixiang.modules.shop.service.dto.YxWechatUserDto; import co.yixiang.modules.shop.service.dto.YxWechatUserQueryCriteria; import org.springframework.data.domain.Pageable; - -import java.util.List; import java.util.Map; +import java.util.List; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-12-13 +* @date 2020-05-12 */ -//@CacheConfig(cacheNames = "yxWechatUser") -public interface YxWechatUserService { +public interface YxWechatUserService extends BaseService{ - /** +/** * 查询数据分页 - * @param criteria - * @param pageable - * @return + * @param criteria 条件 + * @param pageable 分页参数 + * @return Map */ - //@Cacheable Map queryAll(YxWechatUserQueryCriteria criteria, Pageable pageable); /** * 查询所有数据不分页 - * @param criteria - * @return + * @param criteria 条件参数 + * @return List */ - //@Cacheable - List queryAll(YxWechatUserQueryCriteria criteria); + List queryAll(YxWechatUserQueryCriteria criteria); /** - * 根据ID查询 - * @param uid - * @return - */ - //@Cacheable(key = "#p0") - YxWechatUserDTO findById(Integer uid); - - /** - * 创建 - * @param resources - * @return - */ - //@CacheEvict(allEntries = true) - YxWechatUserDTO create(YxWechatUser resources); - - /** - * 编辑 - * @param resources - */ - //@CacheEvict(allEntries = true) - void update(YxWechatUser resources); - - /** - * 删除 - * @param uid - */ - //@CacheEvict(allEntries = true) - void delete(Integer uid); + * 导出数据 + * @param all 待导出的数据 + * @param response / + * @throws IOException / + */ + void download(List all, HttpServletResponse response) throws IOException; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDTO.java index 599b441d..23e63b77 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/OrderTimeDataDTO.java @@ -21,8 +21,8 @@ public class OrderTimeDataDTO implements Serializable { private Integer lastWeekCount;//上周 private Double lastWeekPrice; //上周 - private Long userCount; - private Long orderCount; + private Integer userCount; + private Integer orderCount; private Double priceCount; - private Long goodsCount; + private Integer goodsCount; } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDto.java similarity index 56% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDto.java index 11873f1f..0f0bc4af 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressDto.java @@ -1,29 +1,27 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; - import java.io.Serializable; - /** * @author hupeng -* @date 2019-12-12 +* @date 2020-05-12 */ @Data -public class YxExpressDTO implements Serializable { +public class YxExpressDto implements Serializable { - // 快递公司id + /** 快递公司id */ private Integer id; - // 快递公司简称 + /** 快递公司简称 */ private String code; - // 快递公司全称 + /** 快递公司全称 */ private String name; - // 排序 + /** 排序 */ private Integer sort; - // 是否显示 + /** 是否显示 */ private Integer isShow; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java index 8f006374..9f1d75b4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxExpressQueryCriteria.java @@ -1,10 +1,12 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-12-12 +* @date 2020-05-12 */ @Data public class YxExpressQueryCriteria{ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java index 63bcf1d5..c7c72e0f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialDto.java @@ -6,7 +6,7 @@ import java.io.Serializable; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ @Data public class YxMaterialDto implements Serializable { @@ -14,12 +14,16 @@ public class YxMaterialDto implements Serializable { /** PK */ private String id; + /** 所属租户 */ + private String userId; + /** 逻辑删除标记（0：显示；1：隐藏） */ - private String delFlag; /** 创建时间 */ private Timestamp createTime; + /** 最后更新时间 */ + private Timestamp updateTime; /** 创建者ID */ private String createId; diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java index 288262af..b6f5ca8c 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupDto.java @@ -6,11 +6,10 @@ import java.io.Serializable; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ @Data public class YxMaterialGroupDto implements Serializable { - /** PK */ private String id; @@ -25,4 +24,4 @@ public class YxMaterialGroupDto implements Serializable { /** 分组名 */ private String name; -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupQueryCriteria.java index ba461adb..75c14e86 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialGroupQueryCriteria.java @@ -2,11 +2,11 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; import java.util.List; - +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ @Data public class YxMaterialGroupQueryCriteria{ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialQueryCriteria.java index d9cebc59..59241275 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxMaterialQueryCriteria.java @@ -1,16 +1,13 @@ package co.yixiang.modules.shop.service.dto; -import co.yixiang.annotation.Query; import lombok.Data; import java.util.List; - +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ @Data public class YxMaterialQueryCriteria{ - @Query - private String groupId; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartDto.java new file mode 100644 index 00000000..b2e7245e --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartDto.java @@ -0,0 +1,51 @@ +package co.yixiang.modules.shop.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Data +public class YxStoreCartDto implements Serializable { + + /** 购物车表ID */ + private Long id; + + /** 用户ID */ + private Integer uid; + + /** 类型 */ + private String type; + + /** 商品ID */ + private Integer productId; + + /** 商品属性 */ + private String productAttrUnique; + + /** 商品数量 */ + private Integer cartNum; + + /** 添加时间 */ + private Integer addTime; + + /** 0 = 未购买 1 = 已购买 */ + private Integer isPay; + + /** 是否删除 */ + private Integer isDel; + + /** 是否为立即购买 */ + private Integer isNew; + + /** 拼团id */ + private Integer combinationId; + + /** 秒杀产品ID */ + private Integer seckillId; + + /** 砍价id */ + private Integer bargainId; +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartQueryCriteria.java new file mode 100644 index 00000000..27ba70f2 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCartQueryCriteria.java @@ -0,0 +1,13 @@ +package co.yixiang.modules.shop.service.dto; + +import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Data +public class YxStoreCartQueryCriteria{ +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDto.java similarity index 60% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDto.java index b1b6ba90..b4131e38 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryDto.java @@ -2,43 +2,44 @@ package co.yixiang.modules.shop.service.dto; import com.fasterxml.jackson.annotation.JsonInclude; import lombok.Data; - import java.io.Serializable; import java.util.List; - /** * @author hupeng -* @date 2019-10-03 +* @date 2020-05-12 */ @Data -public class YxStoreCategoryDTO implements Serializable { +public class YxStoreCategoryDto implements Serializable { - // 商品分类表ID + /** 商品分类表ID */ private Integer id; - // 父id + /** 父id */ private Integer pid; - // 分类名称 + /** 分类名称 */ private String cateName; - // 排序 + /** 排序 */ private Integer sort; - // 图标 + /** 图标 */ private String pic; - // 是否推荐 + /** 是否推荐 */ private Integer isShow; - // 添加时间 + /** 添加时间 */ private Integer addTime; + /** 删除状态 */ + private Integer isDel; + @JsonInclude(JsonInclude.Include.NON_EMPTY) - private List children; + private List children; public String getLabel() { return cateName; } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java index 99bf3001..6f276393 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreCategoryQueryCriteria.java @@ -1,19 +1,13 @@ package co.yixiang.modules.shop.service.dto; -import co.yixiang.annotation.Query; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-10-03 +* @date 2020-05-12 */ @Data public class YxStoreCategoryQueryCriteria{ - - // 模糊 - @Query(type = Query.Type.INNER_LIKE) - private String cateName; - - @Query - private Integer isDel = 0; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoDto.java new file mode 100644 index 00000000..68429ada --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoDto.java @@ -0,0 +1,29 @@ +package co.yixiang.modules.shop.service.dto; + +import lombok.Data; +import java.io.Serializable; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Data +public class YxStoreOrderCartInfoDto implements Serializable { + + private Integer id; + + /** 订单id */ + private Integer oid; + + /** 购物车id */ + private Integer cartId; + + /** 商品ID */ + private Integer productId; + + /** 购买东西的详细信息 */ + private String cartInfo; + + /** 唯一id */ + private String unique; +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoQueryCriteria.java new file mode 100644 index 00000000..bd81acf7 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderCartInfoQueryCriteria.java @@ -0,0 +1,13 @@ +package co.yixiang.modules.shop.service.dto; + +import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Data +public class YxStoreOrderCartInfoQueryCriteria{ +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDto.java similarity index 95% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDto.java index fb23d60d..c228bc82 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderDto.java @@ -1,20 +1,16 @@ package co.yixiang.modules.shop.service.dto; -import co.yixiang.modules.shop.domain.YxUser; import lombok.Data; - -import java.io.Serializable; import java.math.BigDecimal; +import java.io.Serializable; import java.util.List; - /** * @author hupeng -* @date 2019-10-14 +* @date 2020-05-12 */ @Data -public class YxStoreOrderDTO implements Serializable { - +public class YxStoreOrderDto implements Serializable { // 订单ID private Integer id; @@ -38,7 +34,7 @@ public class YxStoreOrderDTO implements Serializable { // 用户id private Integer uid; - private YxUserDTO userDTO; + private YxUserDto userDTO; // 用户姓名 private String realName; @@ -184,4 +180,4 @@ public class YxStoreOrderDTO implements Serializable { private Integer isRemind; private Integer isSystemDel; -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java index 00e02bf4..7ca51c7b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderQueryCriteria.java @@ -1,13 +1,12 @@ package co.yixiang.modules.shop.service.dto; -import co.yixiang.annotation.Query; import lombok.Data; - import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-10-14 +* @date 2020-05-12 */ @Data public class YxStoreOrderQueryCriteria{ @@ -64,4 +63,4 @@ public class YxStoreOrderQueryCriteria{ @Query private Integer storeId; -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDto.java similarity index 61% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDto.java index d6a8f5fa..2976f5f2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusDto.java @@ -1,28 +1,26 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; - import java.io.Serializable; - /** * @author hupeng -* @date 2019-11-02 +* @date 2020-05-12 */ @Data -public class YxStoreOrderStatusDTO implements Serializable { +public class YxStoreOrderStatusDto implements Serializable { private Integer id; - // 订单id + /** 订单id */ private Integer oid; - // 操作类型 + /** 操作类型 */ private String changeType; - // 操作备注 + /** 操作备注 */ private String changeMessage; - // 操作时间 + /** 操作时间 */ private Integer changeTime; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java index 4b0a7326..0812040f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreOrderStatusQueryCriteria.java @@ -1,10 +1,12 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-11-02 +* @date 2020-05-12 */ @Data public class YxStoreOrderStatusQueryCriteria{ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductAttrQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductAttrQueryCriteria.java new file mode 100644 index 00000000..22dfe160 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductAttrQueryCriteria.java @@ -0,0 +1,7 @@ +package co.yixiang.modules.shop.service.dto; + +import lombok.Data; + +@Data +public class YxStoreProductAttrQueryCriteria { +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductAttrValueQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductAttrValueQueryCriteria.java new file mode 100644 index 00000000..56d958ef --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductAttrValueQueryCriteria.java @@ -0,0 +1,7 @@ +package co.yixiang.modules.shop.service.dto; + +import lombok.Data; + +@Data +public class YxStoreProductAttrValueQueryCriteria { +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java similarity index 52% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java index 49270598..96409d25 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductDto.java @@ -1,127 +1,121 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; - -import java.io.Serializable; import java.math.BigDecimal; - +import java.io.Serializable; /** * @author hupeng -* @date 2019-10-04 +* @date 2020-05-12 */ @Data -public class YxStoreProductDTO implements Serializable { +public class YxStoreProductDto implements Serializable { - // 商品id + /** 商品id */ private Integer id; - // 商户Id(0为总后台管理员创建,不为0的时候是商户后台创建) + /** 商户Id(0为总后台管理员创建,不为0的时候是商户后台创建) */ private Integer merId; - // 商品图片 + /** 商品图片 */ private String image; - // 轮播图 + /** 轮播图 */ private String sliderImage; - // 商品名称 + /** 商品名称 */ private String storeName; - // 商品简介 + /** 商品简介 */ private String storeInfo; - // 关键字 + /** 关键字 */ private String keyword; - // 产品条码（一维码） + /** 产品条码（一维码） */ private String barCode; - // 分类id + /** 分类id */ private String cateId; - //private String cateName; - - private YxStoreCategorySmallDTO storeCategory; - - // 商品价格 + /** 商品价格 */ private BigDecimal price; - // 会员价格 + /** 会员价格 */ private BigDecimal vipPrice; - // 市场价 + /** 市场价 */ private BigDecimal otPrice; - // 邮费 + /** 邮费 */ private BigDecimal postage; - // 单位名 + /** 单位名 */ private String unitName; - // 排序 + /** 排序 */ private Integer sort; - // 销量 + /** 销量 */ private Integer sales; - // 库存 + /** 库存 */ private Integer stock; - // 状态（0：未上架，1：上架） + /** 状态（0：未上架，1：上架） */ private Integer isShow; - // 是否热卖 + /** 是否热卖 */ private Integer isHot; - // 是否优惠 + /** 是否优惠 */ private Integer isBenefit; - // 是否精品 + /** 是否精品 */ private Integer isBest; - // 是否新品 + /** 是否新品 */ private Integer isNew; - // 产品描述 + /** 产品描述 */ private String description; - // 添加时间 + /** 添加时间 */ private Integer addTime; - // 是否包邮 + /** 是否包邮 */ private Integer isPostage; - // 是否删除 + /** 是否删除 */ private Integer isDel; - // 商户是否代理 0不可代理1可代理 + /** 商户是否代理 0不可代理1可代理 */ private Integer merUse; - // 获得积分 + /** 获得积分 */ private BigDecimal giveIntegral; - // 成本价 + /** 成本价 */ private BigDecimal cost; - // 秒杀状态 0 未开启 1已开启 + /** 秒杀状态 0 未开启 1已开启 */ private Integer isSeckill; - // 砍价状态 0未开启 1开启 + /** 砍价状态 0未开启 1开启 */ private Integer isBargain; - // 是否优品推荐 + /** 是否优品推荐 */ private Integer isGood; - // 虚拟销量 + /** 虚拟销量 */ private Integer ficti; - // 浏览量 + /** 浏览量 */ private Integer browse; - // 产品二维码地址(用户小程序海报) + /** 产品二维码地址(用户小程序海报) */ private String codePath; - // 淘宝京东1688类型 + /** 淘宝京东1688类型 */ private String soureLink; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java index fcacb710..70a2baa6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductQueryCriteria.java @@ -1,24 +1,13 @@ package co.yixiang.modules.shop.service.dto; -import co.yixiang.annotation.Query; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-10-04 +* @date 2020-05-12 */ @Data public class YxStoreProductQueryCriteria{ - - // 模糊 - @Query(type = Query.Type.INNER_LIKE) - private String storeName; - - // 精确 - @Query - private Integer isDel; - - @Query - private Integer isShow; - } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDto.java similarity index 53% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDto.java index 30d2c5e5..c896d9f4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyDto.java @@ -1,65 +1,57 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; - import java.io.Serializable; - /** * @author hupeng -* @date 2019-11-03 +* @date 2020-05-12 */ @Data -public class YxStoreProductReplyDTO implements Serializable { +public class YxStoreProductReplyDto implements Serializable { - // 评论ID + /** 评论ID */ private Integer id; - // 用户ID + /** 用户ID */ private Integer uid; - private YxUserSmallDTO user; - - // 订单ID + /** 订单ID */ private Integer oid; - // 唯一id + /** 唯一id */ private String unique; - // 产品id + /** 产品id */ private Integer productId; - private YxStoreProductSmallDTO storeProduct; - - - // 某种商品类型(普通商品、秒杀商品） + /** 某种商品类型(普通商品、秒杀商品） */ private String replyType; - // 商品分数 + /** 商品分数 */ private Integer productScore; - // 服务分数 + /** 服务分数 */ private Integer serviceScore; - // 评论内容 + /** 评论内容 */ private String comment; - // 评论图片 + /** 评论图片 */ private String pics; - // 评论时间 + /** 评论时间 */ private Integer addTime; - // 管理员回复内容 + /** 管理员回复内容 */ private String merchantReplyContent; - // 管理员回复时间 + /** 管理员回复时间 */ private Integer merchantReplyTime; - // 0未删除1已删除 + /** 0未删除1已删除 */ private Integer isDel; - // 0未回复1已回复 + /** 0未回复1已回复 */ private Integer isReply; - } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java index 24c8aba1..e9ba1630 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxStoreProductReplyQueryCriteria.java @@ -1,14 +1,15 @@ package co.yixiang.modules.shop.service.dto; -import co.yixiang.annotation.Query; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-11-03 +* @date 2020-05-12 */ @Data public class YxStoreProductReplyQueryCriteria{ @Query private Integer isDel; -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDto.java similarity index 58% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDto.java index cd3807a5..763d8f5b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigDto.java @@ -1,30 +1,27 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; - import java.io.Serializable; - /** * @author hupeng -* @date 2019-10-10 +* @date 2020-05-12 */ @Data -public class YxSystemConfigDTO implements Serializable { +public class YxSystemConfigDto implements Serializable { - // 配置id + /** 配置id */ private Integer id; - // 字段名称 + /** 字段名称 */ private String menuName; - - // 默认值 + /** 默认值 */ private String value; - // 排序 + /** 排序 */ private Integer sort; - // 是否隐藏 + /** 是否隐藏 */ private Integer status; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigQueryCriteria.java index 513a30a4..327edfbc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemConfigQueryCriteria.java @@ -1,10 +1,12 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-10-10 +* @date 2020-05-12 */ @Data public class YxSystemConfigQueryCriteria{ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDto.java similarity index 87% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDto.java index 73a277c0..30725cbc 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataDto.java @@ -1,17 +1,15 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; - import java.io.Serializable; import java.util.Map; - /** * @author hupeng -* @date 2019-10-18 +* @date 2020-05-12 */ @Data -public class YxSystemGroupDataDTO implements Serializable { +public class YxSystemGroupDataDto implements Serializable { // 组合数据详情ID private Integer id; @@ -32,4 +30,4 @@ public class YxSystemGroupDataDTO implements Serializable { // 状态（1：开启；2：关闭；） private Integer status; -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java index b433083a..9679ac73 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemGroupDataQueryCriteria.java @@ -1,15 +1,13 @@ package co.yixiang.modules.shop.service.dto; -import co.yixiang.annotation.Query; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-10-18 +* @date 2020-05-12 */ @Data public class YxSystemGroupDataQueryCriteria{ - // 精确 - @Query - private String groupName; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreDto.java index e8f2d140..073f94b7 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreDto.java @@ -1,14 +1,11 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; - - import java.io.Serializable; -import java.util.Date; /** * @author hupeng -* @date 2020-03-03 +* @date 2020-05-12 */ @Data public class YxSystemStoreDto implements Serializable { @@ -53,12 +50,4 @@ public class YxSystemStoreDto implements Serializable { /** 是否删除 */ private Integer isDel; - - private Date dayTimeStart; - - private Date dayTimeEnd; - - private Date validTimeStart; - - private Date validTimeEnd; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreQueryCriteria.java index 51cf3b4e..e6dbe465 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreQueryCriteria.java @@ -6,7 +6,7 @@ import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2020-03-03 +* @date 2020-05-12 */ @Data public class YxSystemStoreQueryCriteria{ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffDto.java index 3e9bf7ec..9e78b147 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffDto.java @@ -5,7 +5,7 @@ import java.io.Serializable; /** * @author hupeng -* @date 2020-03-22 +* @date 2020-05-12 */ @Data public class YxSystemStoreStaffDto implements Serializable { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffQueryCriteria.java index 9b7f2c5e..221d8903 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemStoreStaffQueryCriteria.java @@ -6,7 +6,7 @@ import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2020-03-22 +* @date 2020-05-12 */ @Data public class YxSystemStoreStaffQueryCriteria{ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDto.java similarity index 55% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDto.java index 884ba7a9..2b3646a9 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelDto.java @@ -1,59 +1,57 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; - -import java.io.Serializable; import java.math.BigDecimal; - +import java.io.Serializable; /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ @Data -public class YxSystemUserLevelDTO implements Serializable { +public class YxSystemUserLevelDto implements Serializable { private Integer id; - // 商户id + /** 商户id */ private Integer merId; - // 会员名称 + /** 会员名称 */ private String name; - // 购买金额 + /** 购买金额 */ private BigDecimal money; - // 有效时间 + /** 有效时间 */ private Integer validDate; - // 是否为永久会员 + /** 是否为永久会员 */ private Integer isForever; - // 是否购买,1=购买,0=不购买 + /** 是否购买,1=购买,0=不购买 */ private Integer isPay; - // 是否显示 1=显示,0=隐藏 + /** 是否显示 1=显示,0=隐藏 */ private Integer isShow; - // 会员等级 + /** 会员等级 */ private Integer grade; - // 享受折扣 + /** 享受折扣 */ private BigDecimal discount; - // 会员卡背景 + /** 会员卡背景 */ private String image; - // 会员图标 + /** 会员图标 */ private String icon; - // 说明 + /** 说明 */ private String explain; - // 添加时间 + /** 添加时间 */ private Integer addTime; - // 是否删除.1=删除,0=未删除 + /** 是否删除.1=删除,0=未删除 */ private Integer isDel; -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java index 9db133b7..dfc3a345 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserLevelQueryCriteria.java @@ -1,10 +1,12 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ @Data public class YxSystemUserLevelQueryCriteria{ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java similarity index 56% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java index 3a952284..7bd2a476 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskDto.java @@ -1,48 +1,44 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; - import java.io.Serializable; - /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ @Data -public class YxSystemUserTaskDTO implements Serializable { +public class YxSystemUserTaskDto implements Serializable { private Integer id; - // 任务名称 + /** 任务名称 */ private String name; - // 配置原名 + /** 配置原名 */ private String realName; - // 任务类型 + /** 任务类型 */ private String taskType; - // 限定数 + /** 限定数 */ private Integer number; - // 等级id + /** 等级id */ private Integer levelId; - private String levalName; - - // 排序 + /** 排序 */ private Integer sort; - // 是否显示 + /** 是否显示 */ private Integer isShow; - // 是否务必达成任务,1务必达成,0=满足其一 + /** 是否务必达成任务,1务必达成,0=满足其一 */ private Integer isMust; - // 任务说明 + /** 任务说明 */ private String illustrate; - // 新增时间 + /** 新增时间 */ private Integer addTime; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java index 45e42b9b..24f1f9b3 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxSystemUserTaskQueryCriteria.java @@ -1,10 +1,12 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ @Data public class YxSystemUserTaskQueryCriteria{ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java similarity index 56% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java index 3558e77a..6ace6253 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillDto.java @@ -1,51 +1,49 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; - -import java.io.Serializable; import java.math.BigDecimal; - +import java.io.Serializable; /** * @author hupeng -* @date 2019-11-06 +* @date 2020-05-12 */ @Data -public class YxUserBillDTO implements Serializable { +public class YxUserBillDto implements Serializable { - // 用户账单id + /** 用户账单id */ private Integer id; - // 用户uid + /** 用户uid */ private Integer uid; - // 关联id + /** 关联id */ private String linkId; - // 0 = 支出 1 = 获得 + /** 0 = 支出 1 = 获得 */ private Integer pm; - // 账单标题 + /** 账单标题 */ private String title; - // 明细种类 + /** 明细种类 */ private String category; - // 明细类型 + /** 明细类型 */ private String type; - // 明细数字 + /** 明细数字 */ private BigDecimal number; - // 剩余 + /** 剩余 */ private BigDecimal balance; - // 备注 + /** 备注 */ private String mark; - // 添加时间 + /** 添加时间 */ private Integer addTime; - // 0 = 带确定 1 = 有效 -1 = 无效 + /** 0 = 带确定 1 = 有效 -1 = 无效 */ private Integer status; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java index 2aead770..6ef0640f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserBillQueryCriteria.java @@ -1,14 +1,13 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-11-06 +* @date 2020-05-12 */ @Data public class YxUserBillQueryCriteria{ - private String nickname; - private String category; - private String type; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDto.java similarity index 51% rename from yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDTO.java rename to yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDto.java index 8bfb9b59..665e49cf 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDTO.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserDto.java @@ -1,111 +1,115 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; - -import java.io.Serializable; import java.math.BigDecimal; - +import java.io.Serializable; /** * @author hupeng -* @date 2019-10-06 +* @date 2020-05-12 */ @Data -public class YxUserDTO implements Serializable { +public class YxUserDto implements Serializable { - // 用户id + /** 用户id */ private Integer uid; - // 用户账号 + /** 用户账户(跟accout一样) */ + private String username; + + /** 用户账号 */ private String account; - // 用户密码 + /** 用户密码（跟pwd） */ + private String password; + + /** 用户密码 */ private String pwd; - // 真实姓名 + /** 真实姓名 */ private String realName; - // 生日 + /** 生日 */ private Integer birthday; - // 身份证号码 + /** 身份证号码 */ private String cardId; - // 用户备注 + /** 用户备注 */ private String mark; - // 合伙人id + /** 合伙人id */ private Integer partnerId; - // 用户分组id + /** 用户分组id */ private Integer groupId; - // 用户昵称 + /** 用户昵称 */ private String nickname; - // 用户头像 + /** 用户头像 */ private String avatar; - // 手机号码 + /** 手机号码 */ private String phone; - // 添加时间 + /** 添加时间 */ private Integer addTime; - // 添加ip + /** 添加ip */ private String addIp; - // 最后一次登录时间 + /** 最后一次登录时间 */ private Integer lastTime; - // 最后一次登录ip + /** 最后一次登录ip */ private String lastIp; - // 用户余额 + /** 用户余额 */ private BigDecimal nowMoney; - // 佣金金额 + /** 佣金金额 */ private BigDecimal brokeragePrice; - // 用户剩余积分 + /** 用户剩余积分 */ private BigDecimal integral; - // 连续签到天数 + /** 连续签到天数 */ private Integer signNum; - // 1为正常，0为禁止 + /** 1为正常，0为禁止 */ private Integer status; - // 等级 + /** 等级 */ private Integer level; - // 推广元id + /** 推广元id */ private Integer spreadUid; - // 推广员关联时间 + /** 推广员关联时间 */ private Integer spreadTime; - // 用户类型 + /** 用户类型 */ private String userType; - // 是否为推广员 + /** 是否为推广员 */ private Integer isPromoter; - // 用户购买次数 + /** 用户购买次数 */ private Integer payCount; - // 下级人数 + /** 下级人数 */ private Integer spreadCount; - // 清理会员时间 + /** 清理会员时间 */ private Integer cleanTime; - // 详细地址 + /** 详细地址 */ private String addres; - // 管理员编号 + /** 管理员编号 */ private Integer adminid; - // 用户登陆类型，h5,wechat,routine + /** 用户登陆类型，h5,wechat,routine */ private String loginType; } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java index 5d7411f4..57e91d3a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserQueryCriteria.java @@ -1,11 +1,12 @@ package co.yixiang.modules.shop.service.dto; -import co.yixiang.annotation.Query; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-10-06 +* @date 2020-05-12 */ @Data public class YxUserQueryCriteria{ @@ -23,4 +24,4 @@ public class YxUserQueryCriteria{ @Query private String userType; -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeDto.java index 18f63fb9..1941e1da 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeDto.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeDto.java @@ -6,7 +6,7 @@ import java.io.Serializable; /** * @author hupeng -* @date 2020-03-02 +* @date 2020-05-12 */ @Data public class YxUserRechargeDto implements Serializable { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeQueryCriteria.java index 77479182..f96ea6e9 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxUserRechargeQueryCriteria.java @@ -6,7 +6,7 @@ import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2020-03-02 +* @date 2020-05-12 */ @Data public class YxUserRechargeQueryCriteria{ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDTO.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDTO.java deleted file mode 100644 index 5d8b860b..00000000 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDTO.java +++ /dev/null @@ -1,87 +0,0 @@ -package co.yixiang.modules.shop.service.dto; - -import lombok.Data; - -import java.io.Serializable; -import java.math.BigDecimal; - - -/** -* @author hupeng -* @date 2019-12-13 -*/ -@Data -public class YxWechatUserDTO implements Serializable { - - // 微信用户id - private Integer uid; - - // 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段 - private String unionid; - - // 用户的标识，对当前公众号唯一 - private String openid; - - // 小程序唯一身份ID - private String routineOpenid; - - // 用户的昵称 - private String nickname; - - // 用户头像 - private String headimgurl; - - // 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知 - private Integer sex; - - // 用户所在城市 - private String city; - - // 用户的语言，简体中文为zh_CN - private String language; - - // 用户所在省份 - private String province; - - // 用户所在国家 - private String country; - - // 公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注 - private String remark; - - // 用户所在的分组ID（兼容旧的用户分组接口） - private Integer groupid; - - // 用户被打上的标签ID列表 - private String tagidList; - - // 用户是否订阅该公众号标识 - private Integer subscribe; - - // 关注公众号时间 - private Integer subscribeTime; - - // 添加时间 - private Integer addTime; - - // 一级推荐人 - private Integer stair; - - // 二级推荐人 - private Integer second; - - // 一级推荐人订单 - private Integer orderStair; - - // 二级推荐人订单 - private Integer orderSecond; - - // 佣金 - private BigDecimal nowMoney; - - // 小程序用户会话密匙 - private String sessionKey; - - // 用户类型 - private String userType; -} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDto.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDto.java new file mode 100644 index 00000000..023f4684 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserDto.java @@ -0,0 +1,85 @@ +package co.yixiang.modules.shop.service.dto; + +import lombok.Data; +import java.math.BigDecimal; +import java.io.Serializable; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Data +public class YxWechatUserDto implements Serializable { + + /** 微信用户id */ + private Integer uid; + + /** 只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段 */ + private String unionid; + + /** 用户的标识，对当前公众号唯一 */ + private String openid; + + /** 小程序唯一身份ID */ + private String routineOpenid; + + /** 用户的昵称 */ + private String nickname; + + /** 用户头像 */ + private String headimgurl; + + /** 用户的性别，值为1时是男性，值为2时是女性，值为0时是未知 */ + private Integer sex; + + /** 用户所在城市 */ + private String city; + + /** 用户的语言，简体中文为zh_CN */ + private String language; + + /** 用户所在省份 */ + private String province; + + /** 用户所在国家 */ + private String country; + + /** 公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注 */ + private String remark; + + /** 用户所在的分组ID（兼容旧的用户分组接口） */ + private Integer groupid; + + /** 用户被打上的标签ID列表 */ + private String tagidList; + + /** 用户是否订阅该公众号标识 */ + private Integer subscribe; + + /** 关注公众号时间 */ + private Integer subscribeTime; + + /** 添加时间 */ + private Integer addTime; + + /** 一级推荐人 */ + private Integer stair; + + /** 二级推荐人 */ + private Integer second; + + /** 一级推荐人订单 */ + private Integer orderStair; + + /** 二级推荐人订单 */ + private Integer orderSecond; + + /** 佣金 */ + private BigDecimal nowMoney; + + /** 小程序用户会话密匙 */ + private String sessionKey; + + /** 用户类型 */ + private String userType; +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserQueryCriteria.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserQueryCriteria.java index b097a514..528149a5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserQueryCriteria.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/dto/YxWechatUserQueryCriteria.java @@ -1,10 +1,12 @@ package co.yixiang.modules.shop.service.dto; import lombok.Data; +import java.util.List; +import co.yixiang.annotation.Query; /** * @author hupeng -* @date 2019-12-13 +* @date 2020-05-12 */ @Data public class YxWechatUserQueryCriteria{ diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java index a45d9e46..8e64edd0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java @@ -1,87 +1,79 @@ package co.yixiang.modules.shop.service.impl; -import co.yixiang.exception.EntityExistException; import co.yixiang.modules.shop.domain.YxExpress; -import co.yixiang.modules.shop.repository.YxExpressRepository; +import co.yixiang.exception.EntityExistException; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxExpressService; -import co.yixiang.modules.shop.service.dto.YxExpressDTO; +import co.yixiang.modules.shop.service.dto.YxExpressDto; import co.yixiang.modules.shop.service.dto.YxExpressQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxExpressMapper; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2019-12-12 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxExpress") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxExpressServiceImpl implements YxExpressService { +public class YxExpressServiceImpl extends BaseServiceImpl implements YxExpressService { - private final YxExpressRepository yxExpressRepository; - - private final YxExpressMapper yxExpressMapper; - - public YxExpressServiceImpl(YxExpressRepository yxExpressRepository, YxExpressMapper yxExpressMapper) { - this.yxExpressRepository = yxExpressRepository; - this.yxExpressMapper = yxExpressMapper; - } + private final IGenerator generator; @Override - public Map queryAll(YxExpressQueryCriteria criteria, Pageable pageable){ - Page page = yxExpressRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxExpressMapper::toDto)); + //@Cacheable + public Map queryAll(YxExpressQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxExpressDto.class)); + map.put("totalElements", page.getTotal()); + return map; } - @Override - public List queryAll(YxExpressQueryCriteria criteria){ - return yxExpressMapper.toDto(yxExpressRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } @Override - public YxExpressDTO findById(Integer id) { - Optional yxExpress = yxExpressRepository.findById(id); - ValidationUtil.isNull(yxExpress,"YxExpress","id",id); - return yxExpressMapper.toDto(yxExpress.get()); + //@Cacheable + public List queryAll(YxExpressQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxExpress.class, criteria)); } + @Override - @Transactional(rollbackFor = Exception.class) - public YxExpressDTO create(YxExpress resources) { - if(yxExpressRepository.findByCode(resources.getCode()) != null){ - throw new EntityExistException(YxExpress.class,"code",resources.getCode()); + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxExpressDto yxExpress : all) { + Map map = new LinkedHashMap<>(); + map.put("快递公司简称", yxExpress.getCode()); + map.put("快递公司全称", yxExpress.getName()); + map.put("排序", yxExpress.getSort()); + map.put("是否显示", yxExpress.getIsShow()); + list.add(map); } - return yxExpressMapper.toDto(yxExpressRepository.save(resources)); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxExpress resources) { - Optional optionalYxExpress = yxExpressRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxExpress,"YxExpress","id",resources.getId()); - YxExpress yxExpress = optionalYxExpress.get(); - YxExpress yxExpress1 = null; - yxExpress1 = yxExpressRepository.findByCode(resources.getCode()); - if(yxExpress1 != null && !yxExpress1.getId().equals(yxExpress.getId())){ - throw new EntityExistException(YxExpress.class,"code",resources.getCode()); - } - yxExpress.copy(resources); - yxExpressRepository.save(yxExpress); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - yxExpressRepository.deleteById(id); + FileUtil.downloadExcel(list, response); } } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java index d646fed3..826f3c1a 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java @@ -1,15 +1,18 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxMaterialGroup; -import co.yixiang.modules.shop.repository.YxMaterialGroupRepository; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxMaterialGroupService; import co.yixiang.modules.shop.service.dto.YxMaterialGroupDto; import co.yixiang.modules.shop.service.dto.YxMaterialGroupQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxMaterialGroupMapper; -import co.yixiang.utils.FileUtil; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,77 +23,57 @@ import cn.hutool.core.util.IdUtil; //import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; - +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ @Service +@AllArgsConstructor //@CacheConfig(cacheNames = "yxMaterialGroup") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxMaterialGroupServiceImpl implements YxMaterialGroupService { +public class YxMaterialGroupServiceImpl extends BaseServiceImpl implements YxMaterialGroupService { - private final YxMaterialGroupRepository yxMaterialGroupRepository; - - private final YxMaterialGroupMapper yxMaterialGroupMapper; - - public YxMaterialGroupServiceImpl(YxMaterialGroupRepository yxMaterialGroupRepository, YxMaterialGroupMapper yxMaterialGroupMapper) { - this.yxMaterialGroupRepository = yxMaterialGroupRepository; - this.yxMaterialGroupMapper = yxMaterialGroupMapper; - } + private final IGenerator generator; @Override //@Cacheable - public Map queryAll(YxMaterialGroupQueryCriteria criteria, Pageable pageable){ - Page page = yxMaterialGroupRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxMaterialGroupMapper::toDto)); + public Map queryAll(YxMaterialGroupQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxMaterialGroupDto.class)); + map.put("totalElements", page.getTotal()); + return map; } + @Override //@Cacheable - public List queryAll(YxMaterialGroupQueryCriteria criteria){ - return yxMaterialGroupMapper.toDto(yxMaterialGroupRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + public List queryAll(YxMaterialGroupQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxMaterialGroup.class, criteria)); } - @Override - //@Cacheable(key = "#p0") - public YxMaterialGroupDto findById(String id) { - YxMaterialGroup yxMaterialGroup = yxMaterialGroupRepository.findById(id).orElseGet(YxMaterialGroup::new); - ValidationUtil.isNull(yxMaterialGroup.getId(),"YxMaterialGroup","id",id); - return yxMaterialGroupMapper.toDto(yxMaterialGroup); - } @Override - //@CacheEvict(allEntries = true) - @Transactional(rollbackFor = Exception.class) - public YxMaterialGroupDto create(YxMaterialGroup resources) { - resources.setId(IdUtil.simpleUUID()); - return yxMaterialGroupMapper.toDto(yxMaterialGroupRepository.save(resources)); - } - - @Override - //@CacheEvict(allEntries = true) - @Transactional(rollbackFor = Exception.class) - public void update(YxMaterialGroup resources) { - YxMaterialGroup yxMaterialGroup = yxMaterialGroupRepository.findById(resources.getId()).orElseGet(YxMaterialGroup::new); - ValidationUtil.isNull( yxMaterialGroup.getId(),"YxMaterialGroup","id",resources.getId()); - yxMaterialGroup.copy(resources); - yxMaterialGroupRepository.save(yxMaterialGroup); - } - - @Override - //@CacheEvict(allEntries = true) - public void deleteAll(String[] ids) { - for (String id : ids) { - yxMaterialGroupRepository.deleteById(id); + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxMaterialGroupDto yxMaterialGroup : all) { + Map map = new LinkedHashMap<>(); + map.put("逻辑删除标记（0：显示；1：隐藏）", yxMaterialGroup.getDelFlag()); + map.put("创建时间", yxMaterialGroup.getCreateTime()); + map.put("创建者ID", yxMaterialGroup.getCreateId()); + map.put("分组名", yxMaterialGroup.getName()); + list.add(map); } + FileUtil.downloadExcel(list, response); } - - @Override - public void deleteById(String id) { - yxMaterialGroupRepository.deleteById(id); - } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java index da60d443..1bb5c6b5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java @@ -1,15 +1,18 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxMaterial; -import co.yixiang.modules.shop.repository.YxMaterialRepository; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxMaterialService; import co.yixiang.modules.shop.service.dto.YxMaterialDto; import co.yixiang.modules.shop.service.dto.YxMaterialQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxMaterialMapper; -import co.yixiang.utils.FileUtil; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; @@ -20,76 +23,61 @@ import cn.hutool.core.util.IdUtil; //import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ @Service +@AllArgsConstructor //@CacheConfig(cacheNames = "yxMaterial") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxMaterialServiceImpl implements YxMaterialService { +public class YxMaterialServiceImpl extends BaseServiceImpl implements YxMaterialService { - private final YxMaterialRepository yxMaterialRepository; - - private final YxMaterialMapper yxMaterialMapper; - - public YxMaterialServiceImpl(YxMaterialRepository yxMaterialRepository, YxMaterialMapper yxMaterialMapper) { - this.yxMaterialRepository = yxMaterialRepository; - this.yxMaterialMapper = yxMaterialMapper; - } + private final IGenerator generator; @Override //@Cacheable - public Map queryAll(YxMaterialQueryCriteria criteria, Pageable pageable){ - Page page = yxMaterialRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxMaterialMapper::toDto)); + public Map queryAll(YxMaterialQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxMaterialDto.class)); + map.put("totalElements", page.getTotal()); + return map; } + @Override //@Cacheable - public List queryAll(YxMaterialQueryCriteria criteria){ - return yxMaterialMapper.toDto(yxMaterialRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + public List queryAll(YxMaterialQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxMaterial.class, criteria)); } - @Override - //@Cacheable(key = "#p0") - public YxMaterialDto findById(String id) { - YxMaterial yxMaterial = yxMaterialRepository.findById(id).orElseGet(YxMaterial::new); - ValidationUtil.isNull(yxMaterial.getId(),"YxMaterial","id",id); - return yxMaterialMapper.toDto(yxMaterial); - } @Override - //@CacheEvict(allEntries = true) - @Transactional(rollbackFor = Exception.class) - public YxMaterialDto create(YxMaterial resources) { - resources.setId(IdUtil.simpleUUID()); - return yxMaterialMapper.toDto(yxMaterialRepository.save(resources)); - } - - @Override - //@CacheEvict(allEntries = true) - @Transactional(rollbackFor = Exception.class) - public void update(YxMaterial resources) { - YxMaterial yxMaterial = yxMaterialRepository.findById(resources.getId()).orElseGet(YxMaterial::new); - ValidationUtil.isNull( yxMaterial.getId(),"YxMaterial","id",resources.getId()); - yxMaterial.copy(resources); - yxMaterialRepository.save(yxMaterial); - } - - @Override - //@CacheEvict(allEntries = true) - public void deleteAll(String[] ids) { - for (String id : ids) { - yxMaterialRepository.deleteById(id); + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxMaterialDto yxMaterial : all) { + Map map = new LinkedHashMap<>(); + map.put("所属租户", yxMaterial.getUserId()); + map.put("创建时间", yxMaterial.getCreateTime()); + map.put("最后更新时间", yxMaterial.getUpdateTime()); + map.put("创建者ID", yxMaterial.getCreateId()); + map.put("类型1、图片；2、视频", yxMaterial.getType()); + map.put("分组ID", yxMaterial.getGroupId()); + map.put("素材名", yxMaterial.getName()); + map.put("素材链接", yxMaterial.getUrl()); + list.add(map); } + FileUtil.downloadExcel(list, response); } - - @Override - public void deleteById(String id) { - yxMaterialRepository.deleteById(id); - } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java new file mode 100644 index 00000000..0ee5b527 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCartServiceImpl.java @@ -0,0 +1,93 @@ +package co.yixiang.modules.shop.service.impl; + +import co.yixiang.modules.shop.domain.YxStoreCart; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.modules.shop.service.dto.CountDto; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; +import co.yixiang.modules.shop.service.YxStoreCartService; +import co.yixiang.modules.shop.service.dto.YxStoreCartDto; +import co.yixiang.modules.shop.service.dto.YxStoreCartQueryCriteria; +import co.yixiang.modules.shop.service.mapper.YxStoreCartMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxStoreCart") +@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) +public class YxStoreCartServiceImpl extends BaseServiceImpl implements YxStoreCartService { + + private final IGenerator generator; + + private final YxStoreCartMapper storeCartMapper; + @Override + //@Cacheable + public Map queryAll(YxStoreCartQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxStoreCartDto.class)); + map.put("totalElements", page.getTotal()); + return map; + } + + + @Override + //@Cacheable + public List queryAll(YxStoreCartQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreCart.class, criteria)); + } + + + @Override + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxStoreCartDto yxStoreCart : all) { + Map map = new LinkedHashMap<>(); + map.put("用户ID", yxStoreCart.getUid()); + map.put("类型", yxStoreCart.getType()); + map.put("商品ID", yxStoreCart.getProductId()); + map.put("商品属性", yxStoreCart.getProductAttrUnique()); + map.put("商品数量", yxStoreCart.getCartNum()); + map.put("添加时间", yxStoreCart.getAddTime()); + map.put("0 = 未购买 1 = 已购买", yxStoreCart.getIsPay()); + map.put("是否删除", yxStoreCart.getIsDel()); + map.put("是否为立即购买", yxStoreCart.getIsNew()); + map.put("拼团id", yxStoreCart.getCombinationId()); + map.put("秒杀产品ID", yxStoreCart.getSeckillId()); + map.put("砍价id", yxStoreCart.getBargainId()); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } + + @Override + public List findCateName() { + return storeCartMapper.findCateName(); + } +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java index 13b34b60..9214a0f6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java @@ -1,144 +1,104 @@ package co.yixiang.modules.shop.service.impl; -import cn.hutool.core.util.ObjectUtil; -import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxStoreCategory; -import co.yixiang.modules.shop.domain.YxStoreProduct; -import co.yixiang.modules.shop.repository.YxStoreCategoryRepository; -import co.yixiang.modules.shop.repository.YxStoreProductRepository; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxStoreCategoryService; -import co.yixiang.modules.shop.service.dto.YxStoreCategoryDTO; +import co.yixiang.modules.shop.service.dto.YxStoreCategoryDto; import co.yixiang.modules.shop.service.dto.YxStoreCategoryQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxStoreCategoryMapper; -import co.yixiang.utils.FileUtil; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import org.springframework.util.CollectionUtils; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.util.*; +import java.io.IOException; import java.util.stream.Collectors; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-10-03 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxStoreCategory") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreCategoryServiceImpl implements YxStoreCategoryService { +public class YxStoreCategoryServiceImpl extends BaseServiceImpl implements YxStoreCategoryService { - private final YxStoreCategoryRepository yxStoreCategoryRepository; - private final YxStoreProductRepository yxStoreProductRepository; - - private final YxStoreCategoryMapper yxStoreCategoryMapper; - - public YxStoreCategoryServiceImpl(YxStoreCategoryRepository yxStoreCategoryRepository, - YxStoreProductRepository yxStoreProductRepository, - YxStoreCategoryMapper yxStoreCategoryMapper) { - this.yxStoreCategoryRepository = yxStoreCategoryRepository; - this.yxStoreProductRepository = yxStoreProductRepository; - this.yxStoreCategoryMapper = yxStoreCategoryMapper; - } + private final IGenerator generator; @Override - public void download(List queryAll, HttpServletResponse response) throws IOException { + //@Cacheable + public Map queryAll(YxStoreCategoryQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", page.getList()); + map.put("totalElements", page.getTotal()); + return map; + } + + + @Override + //@Cacheable + public List queryAll(YxStoreCategoryQueryCriteria criteria){ + return generator.convert(baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreCategory.class, criteria)),YxStoreCategoryDto.class); + } + + + @Override + public void download(List all, HttpServletResponse response) throws IOException { List> list = new ArrayList<>(); - for (YxStoreCategoryDTO storeCategoryDTO : queryAll) { + for (YxStoreCategoryDto yxStoreCategory : all) { Map map = new LinkedHashMap<>(); - map.put("分类名称", storeCategoryDTO.getCateName()); - map.put("分类状态", storeCategoryDTO.getIsShow() == 1 ? "启用" : "停用"); + map.put("父id", yxStoreCategory.getPid()); + map.put("分类名称", yxStoreCategory.getCateName()); + map.put("排序", yxStoreCategory.getSort()); + map.put("图标", yxStoreCategory.getPic()); + map.put("是否推荐", yxStoreCategory.getIsShow()); + map.put("添加时间", yxStoreCategory.getAddTime()); + map.put("删除状态", yxStoreCategory.getIsDel()); list.add(map); } FileUtil.downloadExcel(list, response); } @Override - public Map queryAll(YxStoreCategoryQueryCriteria criteria, Pageable pageable){ - Page page = yxStoreCategoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxStoreCategoryMapper::toDto)); - } - - @Override - public List queryAll(YxStoreCategoryQueryCriteria criteria){ - return yxStoreCategoryMapper.toDto(yxStoreCategoryRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } - - @Override - public YxStoreCategoryDTO findById(Integer id) { - Optional yxStoreCategory = yxStoreCategoryRepository.findById(id); - ValidationUtil.isNull(yxStoreCategory,"YxStoreCategory","id",id); - return yxStoreCategoryMapper.toDto(yxStoreCategory.get()); - } - - @Override - public YxStoreCategoryDTO findByName(String name) { - return null; - } - - @Override - @Transactional(rollbackFor = Exception.class) - public YxStoreCategoryDTO create(YxStoreCategory resources) { - if(ObjectUtil.isNull(resources.getPid())) resources.setPid(0); - if(ObjectUtil.isNull(resources.getSort())) resources.setSort(1); - return yxStoreCategoryMapper.toDto(yxStoreCategoryRepository.save(resources)); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxStoreCategory resources) { - if(resources.getId().equals(resources.getPid())){ - throw new BadRequestException("自己不能选择自己哦"); - } - Optional optionalYxStoreCategory = yxStoreCategoryRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxStoreCategory,"YxStoreCategory","id",resources.getId()); - YxStoreCategory yxStoreCategory = optionalYxStoreCategory.get(); - yxStoreCategory.copy(resources); - yxStoreCategoryRepository.save(yxStoreCategory); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - YxStoreCategory storeCategory = yxStoreCategoryRepository.findByPid(id); - - if(storeCategory != null) throw new BadRequestException("请先删除子类"); - YxStoreCategory category = new YxStoreCategory(); - category.setId(id); - List storeProduct = yxStoreProductRepository.findByStoreCategoryAndIsDel(category,0); - - if(!storeProduct.isEmpty()) throw new BadRequestException("此分类下有商品,不能删除"); - - yxStoreCategoryRepository.delCategory(id); - } - - - @Override - public Object buildTree(List categoryDTOS) { - Set trees = new LinkedHashSet<>(); - Set cates= new LinkedHashSet<>(); - List deptNames = categoryDTOS.stream().map(YxStoreCategoryDTO::getCateName) + public Object buildTree(List categoryDTOS) { + Set trees = new LinkedHashSet<>(); + Set cates= new LinkedHashSet<>(); + List deptNames = categoryDTOS.stream().map(YxStoreCategoryDto::getCateName) .collect(Collectors.toList()); - YxStoreCategoryDTO categoryDTO = new YxStoreCategoryDTO(); + YxStoreCategoryDto categoryDTO = new YxStoreCategoryDto(); Boolean isChild; - List categories = yxStoreCategoryRepository.findAll(); - for (YxStoreCategoryDTO deptDTO : categoryDTOS) { + List categories = this.list(); + for (YxStoreCategoryDto deptDTO : categoryDTOS) { isChild = false; if ("0".equals(deptDTO.getPid().toString())) { trees.add(deptDTO); } - for (YxStoreCategoryDTO it : categoryDTOS) { + for (YxStoreCategoryDto it : categoryDTOS) { if (it.getPid().equals(deptDTO.getId())) { isChild = true; if (deptDTO.getChildren() == null) { - deptDTO.setChildren(new ArrayList()); + deptDTO.setChildren(new ArrayList()); } deptDTO.getChildren().add(it); } @@ -166,6 +126,5 @@ public class YxStoreCategoryServiceImpl implements YxStoreCategoryService { map.put("totalElements",totalElements); map.put("content",CollectionUtils.isEmpty(trees)?categoryDTOS:trees); return map; - //return null; } } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java new file mode 100644 index 00000000..0ad57fdb --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderCartInfoServiceImpl.java @@ -0,0 +1,75 @@ +package co.yixiang.modules.shop.service.impl; + +import co.yixiang.modules.shop.domain.YxStoreOrderCartInfo; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.FileUtil; +import co.yixiang.modules.shop.service.YxStoreOrderCartInfoService; +import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoDto; +import co.yixiang.modules.shop.service.dto.YxStoreOrderCartInfoQueryCriteria; +import co.yixiang.modules.shop.service.mapper.YxStoreOrderCartInfoMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Map; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxStoreOrderCartInfo") +@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) +public class YxStoreOrderCartInfoServiceImpl extends BaseServiceImpl implements YxStoreOrderCartInfoService { + + private final IGenerator generator; + + @Override + //@Cacheable + public Map queryAll(YxStoreOrderCartInfoQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxStoreOrderCartInfoDto.class)); + map.put("totalElements", page.getTotal()); + return map; + } + + + @Override + //@Cacheable + public List queryAll(YxStoreOrderCartInfoQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreOrderCartInfo.class, criteria)); + } + + + @Override + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxStoreOrderCartInfoDto yxStoreOrderCartInfo : all) { + Map map = new LinkedHashMap<>(); + map.put("订单id", yxStoreOrderCartInfo.getOid()); + map.put("购物车id", yxStoreOrderCartInfo.getCartId()); + map.put("商品ID", yxStoreOrderCartInfo.getProductId()); + map.put("购买东西的详细信息", yxStoreOrderCartInfo.getCartInfo()); + map.put("唯一id", yxStoreOrderCartInfo.getUnique()); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java index 4cb1bece..986d684d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java @@ -3,89 +3,72 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.NumberUtil; import cn.hutool.core.util.ObjectUtil; -import cn.hutool.core.util.StrUtil; import co.yixiang.enums.OrderInfoEnum; import co.yixiang.exception.BadRequestException; import co.yixiang.exception.EntityExistException; import co.yixiang.modules.activity.domain.YxStorePink; import co.yixiang.modules.activity.repository.YxStorePinkRepository; -import co.yixiang.modules.shop.domain.StoreOrderCartInfo; -import co.yixiang.modules.shop.domain.YxStoreOrder; -import co.yixiang.modules.shop.domain.YxStoreOrderStatus; -import co.yixiang.modules.shop.domain.YxUserBill; -import co.yixiang.modules.shop.repository.*; +import co.yixiang.modules.shop.domain.*; +import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.service.*; import co.yixiang.modules.shop.service.dto.*; -import co.yixiang.modules.shop.service.mapper.YxStoreOrderMapper; +import co.yixiang.modules.shop.service.mapper.YxStoreProductMapper; +import co.yixiang.modules.shop.service.mapper.YxUserMapper; import co.yixiang.mp.service.YxMiniPayService; import co.yixiang.mp.service.YxPayService; -import co.yixiang.utils.FileUtil; -import co.yixiang.utils.OrderUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.*; import com.alibaba.fastjson.JSON; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.github.binarywang.wxpay.exception.WxPayException; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.modules.shop.service.mapper.YxStoreOrderMapper; import lombok.extern.slf4j.Slf4j; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Pageable; -import javax.servlet.http.HttpServletResponse; -import java.io.IOException; import java.math.BigDecimal; -import java.text.ParseException; import java.util.*; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-10-14 +* @date 2020-05-12 */ @Slf4j @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxStoreOrder") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreOrderServiceImpl implements YxStoreOrderService { - - private final YxStoreOrderRepository yxStoreOrderRepository; - private final YxStoreOrderCartInfoRepository yxStoreOrderCartInfoRepository; - private final YxUserRepository userRepository; - private final YxStorePinkRepository storePinkRepository; - private final YxStoreProductRepository storeProductRepository; - private final YxStoreCartRepository yxStoreCartRepository; - - private final YxStoreOrderMapper yxStoreOrderMapper; +public class YxStoreOrderServiceImpl extends BaseServiceImpl implements YxStoreOrderService { + private final IGenerator generator; + private YxUserService userService; + private YxUserMapper userMapper; + private YxStorePinkRepository storePinkRepository; + private YxStoreOrderCartInfoService storeOrderCartInfoService; private final YxUserBillService yxUserBillService; private final YxStoreOrderStatusService yxStoreOrderStatusService; - private final YxUserService userService; private final YxPayService payService; private final YxMiniPayService miniPayService; private final YxSystemStoreService systemStoreService; - - public YxStoreOrderServiceImpl(YxStoreOrderRepository yxStoreOrderRepository, YxStoreOrderCartInfoRepository yxStoreOrderCartInfoRepository, YxUserRepository userRepository, - YxStorePinkRepository storePinkRepository, YxStoreOrderMapper yxStoreOrderMapper, YxUserBillService yxUserBillService, - YxStoreOrderStatusService yxStoreOrderStatusService, YxSystemStoreService systemStoreService,YxStoreCartRepository yxStoreCartRepository, - YxUserService userService, YxPayService payService, YxMiniPayService miniPayService,YxStoreProductRepository storeProductRepository) { - this.yxStoreOrderRepository = yxStoreOrderRepository; - this.yxStoreOrderCartInfoRepository = yxStoreOrderCartInfoRepository; - this.userRepository = userRepository; - this.storePinkRepository = storePinkRepository; - this.yxStoreOrderMapper = yxStoreOrderMapper; - this.yxUserBillService = yxUserBillService; - this.yxStoreOrderStatusService = yxStoreOrderStatusService; - this.userService = userService; - this.payService = payService; - this.miniPayService = miniPayService; - this.systemStoreService = systemStoreService; - this.storeProductRepository = storeProductRepository; - this.yxStoreCartRepository = yxStoreCartRepository; - } + private final YxStoreCartService storeCartService; + private final YxStoreOrderMapper yxStoreOrderMapper; + private final YxStoreProductMapper yxStoreProductMapper; @Override public OrderCountDto getOrderCount() { //获取所有订单转态为已支付的 - List nameList = yxStoreCartRepository.findCateName(); + List nameList = storeCartService.findCateName(); System.out.println("nameList:"+nameList); Map childrenMap = new HashMap<>(); nameList.forEach(i ->{ @@ -123,23 +106,23 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService { .beginOfMonth(new Date())); OrderTimeDataDTO orderTimeDataDTO = new OrderTimeDataDTO(); - orderTimeDataDTO.setTodayCount(yxStoreOrderRepository.countByPayTimeGreaterThanEqual(today)); - //orderTimeDataDTO.setTodayPrice(yxStoreOrderRepository.sumPrice(today)); +// orderTimeDataDTO.setTodayCount(yxStoreOrderMapper.countByPayTimeGreaterThanEqual(today)); +// //orderTimeDataDTO.setTodayPrice(yxStoreOrderMapper.sumPrice(today)); +// +// orderTimeDataDTO.setProCount(yxStoreOrderMapper +// .countByPayTimeLessThanAndPayTimeGreaterThanEqual(today,yesterday)); +// //orderTimeDataDTO.setProPrice(yxStoreOrderMapper.sumTPrice(today,yesterday)); +// +// orderTimeDataDTO.setLastWeekCount(yxStoreOrderMapper.countByPayTimeGreaterThanEqual(lastWeek)); +// //orderTimeDataDTO.setLastWeekPrice(yxStoreOrderMapper.sumPrice(lastWeek)); +// +// orderTimeDataDTO.setMonthCount(yxStoreOrderMapper.countByPayTimeGreaterThanEqual(nowMonth)); +// //orderTimeDataDTO.setMonthPrice(yxStoreOrderMapper.sumPrice(nowMonth)); - orderTimeDataDTO.setProCount(yxStoreOrderRepository - .countByPayTimeLessThanAndPayTimeGreaterThanEqual(today,yesterday)); - //orderTimeDataDTO.setProPrice(yxStoreOrderRepository.sumTPrice(today,yesterday)); - - orderTimeDataDTO.setLastWeekCount(yxStoreOrderRepository.countByPayTimeGreaterThanEqual(lastWeek)); - //orderTimeDataDTO.setLastWeekPrice(yxStoreOrderRepository.sumPrice(lastWeek)); - - orderTimeDataDTO.setMonthCount(yxStoreOrderRepository.countByPayTimeGreaterThanEqual(nowMonth)); - //orderTimeDataDTO.setMonthPrice(yxStoreOrderRepository.sumPrice(nowMonth)); - - orderTimeDataDTO.setUserCount(userRepository.count()); - orderTimeDataDTO.setOrderCount(yxStoreOrderRepository.count()); - orderTimeDataDTO.setPriceCount(yxStoreOrderRepository.sumTotalPrice()); - orderTimeDataDTO.setGoodsCount(storeProductRepository.count()); + orderTimeDataDTO.setUserCount(userMapper.selectCount(new QueryWrapper())); + orderTimeDataDTO.setOrderCount(yxStoreOrderMapper.selectCount(new QueryWrapper())); + orderTimeDataDTO.setPriceCount(yxStoreOrderMapper.sumTotalPrice()); + orderTimeDataDTO.setGoodsCount(yxStoreProductMapper.selectCount(new QueryWrapper())); return orderTimeDataDTO; } @@ -150,73 +133,230 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService { int nowMonth = OrderUtil.dateToTimestampT(DateUtil .beginOfMonth(new Date())); - map.put("chart",yxStoreOrderRepository.chartList(nowMonth)); - map.put("chartT",yxStoreOrderRepository.chartListT(nowMonth)); + map.put("chart",yxStoreOrderMapper.chartList(nowMonth)); + map.put("chartT",yxStoreOrderMapper.chartListT(nowMonth)); return map; } + @Override + //@Cacheable + public Map queryAll(YxStoreOrderQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + List storeOrderDTOS = new ArrayList<>(); + for (YxStoreOrder yxStoreOrder : page.getList()) { + YxStoreOrderDto yxStoreOrderDTO = generator.convert(yxStoreOrder,YxStoreOrderDto.class); + Integer _status = OrderUtil.orderStatus(yxStoreOrder.getPaid(),yxStoreOrder.getStatus(), + yxStoreOrder.getRefundStatus()); + + if(yxStoreOrder.getStoreId() > 0) { + String storeName = systemStoreService.getById(yxStoreOrder.getStoreId()).getName(); + yxStoreOrderDTO.setStoreName(storeName); + } + + //订单状态 + String orderStatusStr = OrderUtil.orderStatusStr(yxStoreOrder.getPaid() + ,yxStoreOrder.getStatus(),yxStoreOrder.getShippingType() + ,yxStoreOrder.getRefundStatus()); + + if(_status == 3){ + String refundTime = OrderUtil.stampToDate(String.valueOf(yxStoreOrder + .getRefundReasonTime())); + String str = "申请退款
"+ + "退款原因："+yxStoreOrder.getRefundReasonWap()+"
" + + "备注说明："+yxStoreOrder.getRefundReasonWapExplain()+"
" + + "退款时间："+refundTime+"
"; + orderStatusStr = str; + } + yxStoreOrderDTO.setStatusName(orderStatusStr); + + yxStoreOrderDTO.set_status(_status); + + String payTypeName = OrderUtil.payTypeName(yxStoreOrder.getPayType() + ,yxStoreOrder.getPaid()); + yxStoreOrderDTO.setPayTypeName(payTypeName); + + yxStoreOrderDTO.setPinkName(orderType(yxStoreOrder.getId() + ,yxStoreOrder.getPinkId(),yxStoreOrder.getCombinationId() + ,yxStoreOrder.getSeckillId(),yxStoreOrder.getBargainId(), + yxStoreOrder.getShippingType())); + + List cartInfos = storeOrderCartInfoService.list( + new QueryWrapper().eq("oid",yxStoreOrder.getId())); + List cartInfoDTOS = new ArrayList<>(); + for (YxStoreOrderCartInfo cartInfo : cartInfos) { + StoreOrderCartInfoDTO cartInfoDTO = new StoreOrderCartInfoDTO(); + cartInfoDTO.setCartInfoMap(JSON.parseObject(cartInfo.getCartInfo())); + + cartInfoDTOS.add(cartInfoDTO); + } + yxStoreOrderDTO.setCartInfoList(cartInfoDTOS); + yxStoreOrderDTO.setUserDTO(generator.convert(userService.getOne(new QueryWrapper().eq("uid",yxStoreOrder.getUid())),YxUserDto.class)); + + storeOrderDTOS.add(yxStoreOrderDTO); + + } + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxStoreOrderDto.class)); + map.put("totalElements", page.getTotal()); + return map; + } + + + @Override + //@Cacheable + public List queryAll(YxStoreOrderQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreOrder.class, criteria)); + } @Override @Transactional(rollbackFor = Exception.class) - public void refund(YxStoreOrder resources) { - if(resources.getPayPrice().doubleValue() < 0){ - throw new BadRequestException("请输入退款金额"); + public YxStoreOrderDto create(YxStoreOrder resources) { + if(this.getOne(new QueryWrapper().eq("unique",resources.getUnique())) != null){ + throw new EntityExistException(YxStoreOrder.class,"unique",resources.getUnique()); } + this.save(resources); + return generator.convert(resources,YxStoreOrderDto.class); + } - if(resources.getPayType().equals("yue")){ - //修改状态 - resources.setRefundStatus(2); - resources.setRefundPrice(resources.getPayPrice()); - update(resources); - - //退款到余额 - YxUserDTO userDTO = userService.findById(resources.getUid()); - userRepository.updateMoney(resources.getPayPrice().doubleValue(), - resources.getUid()); - - YxUserBill userBill = new YxUserBill(); - userBill.setUid(resources.getUid()); - - userBill.setLinkId(resources.getId().toString()); - userBill.setPm(1); - userBill.setTitle("商品退款"); - userBill.setCategory("now_money"); - userBill.setType("pay_product_refund"); - userBill.setNumber(resources.getPayPrice()); - userBill.setBalance(NumberUtil.add(resources.getPayPrice(),userDTO.getNowMoney())); - userBill.setMark("订单退款到余额"); - userBill.setAddTime(OrderUtil.getSecondTimestampTwo()); - userBill.setStatus(1); - yxUserBillService.create(userBill); + @Override + @Transactional(rollbackFor = Exception.class) + public void update(YxStoreOrder resources) { + YxStoreOrder yxStoreOrder = this.getById(resources.getId()); + YxStoreOrder yxStoreOrder1 = this.getOne(new QueryWrapper().eq("unique",resources.getUnique())); + if(yxStoreOrder1 != null && !yxStoreOrder1.getId().equals(yxStoreOrder.getId())){ + throw new EntityExistException(YxStoreOrder.class,"unique",resources.getUnique()); + } + yxStoreOrder.copy(resources); + this.saveOrUpdate(yxStoreOrder); + } - YxStoreOrderStatus storeOrderStatus = new YxStoreOrderStatus(); - storeOrderStatus.setOid(resources.getId()); - storeOrderStatus.setChangeType("refund_price"); - storeOrderStatus.setChangeMessage("退款给用户："+resources.getPayPrice() +"元"); - storeOrderStatus.setChangeTime(OrderUtil.getSecondTimestampTwo()); + @Override + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxStoreOrderDto yxStoreOrder : all) { + Map map = new LinkedHashMap<>(); + map.put("订单号", yxStoreOrder.getOrderId()); + map.put("用户id", yxStoreOrder.getUid()); + map.put("用户姓名", yxStoreOrder.getRealName()); + map.put("用户电话", yxStoreOrder.getUserPhone()); + map.put("详细地址", yxStoreOrder.getUserAddress()); + map.put("购物车id", yxStoreOrder.getCartId()); + map.put("运费金额", yxStoreOrder.getFreightPrice()); + map.put("订单商品总数", yxStoreOrder.getTotalNum()); + map.put("订单总价", yxStoreOrder.getTotalPrice()); + map.put("邮费", yxStoreOrder.getTotalPostage()); + map.put("实际支付金额", yxStoreOrder.getPayPrice()); + map.put("支付邮费", yxStoreOrder.getPayPostage()); + map.put("抵扣金额", yxStoreOrder.getDeductionPrice()); + map.put("优惠券id", yxStoreOrder.getCouponId()); + map.put("优惠券金额", yxStoreOrder.getCouponPrice()); + map.put("支付状态", yxStoreOrder.getPaid()); + map.put("支付时间", yxStoreOrder.getPayTime()); + map.put("支付方式", yxStoreOrder.getPayType()); + map.put("创建时间", yxStoreOrder.getAddTime()); + map.put("订单状态（-1 : 申请退款 -2 : 退货成功 0：待发货；1：待收货；2：已收货；3：待评价；-1：已退款）", yxStoreOrder.getStatus()); + map.put("0 未退款 1 申请中 2 已退款", yxStoreOrder.getRefundStatus()); + map.put("退款图片", yxStoreOrder.getRefundReasonWapImg()); + map.put("退款用户说明", yxStoreOrder.getRefundReasonWapExplain()); + map.put("退款时间", yxStoreOrder.getRefundReasonTime()); + map.put("前台退款原因", yxStoreOrder.getRefundReasonWap()); + map.put("不退款的理由", yxStoreOrder.getRefundReason()); + map.put("退款金额", yxStoreOrder.getRefundPrice()); + map.put("快递公司编号", yxStoreOrder.getDeliverySn()); + map.put("快递名称/送货人姓名", yxStoreOrder.getDeliveryName()); + map.put("发货类型", yxStoreOrder.getDeliveryType()); + map.put("快递单号/手机号", yxStoreOrder.getDeliveryId()); + map.put("消费赚取积分", yxStoreOrder.getGainIntegral()); + map.put("使用积分", yxStoreOrder.getUseIntegral()); + map.put("给用户退了多少积分", yxStoreOrder.getBackIntegral()); + map.put("备注", yxStoreOrder.getMark()); + map.put("是否删除", yxStoreOrder.getIsDel()); + map.put("唯一id(md5加密)类似id", yxStoreOrder.getUnique()); + map.put("管理员备注", yxStoreOrder.getRemark()); + map.put("商户ID", yxStoreOrder.getMerId()); + map.put(" isMerCheck", yxStoreOrder.getIsMerCheck()); + map.put("拼团产品id0一般产品", yxStoreOrder.getCombinationId()); + map.put("拼团id 0没有拼团", yxStoreOrder.getPinkId()); + map.put("成本价", yxStoreOrder.getCost()); + map.put("秒杀产品ID", yxStoreOrder.getSeckillId()); + map.put("砍价id", yxStoreOrder.getBargainId()); + map.put("核销码", yxStoreOrder.getVerifyCode()); + map.put("门店id", yxStoreOrder.getStoreId()); + map.put("配送方式 1=快递 ，2=门店自提", yxStoreOrder.getShippingType()); + map.put("支付渠道(0微信公众号1微信小程序)", yxStoreOrder.getIsChannel()); + map.put(" isRemind", yxStoreOrder.getIsRemind()); + map.put(" isSystemDel", yxStoreOrder.getIsSystemDel()); + list.add(map); + } + FileUtil.downloadExcel(list, response); + } - yxStoreOrderStatusService.create(storeOrderStatus); - }else{ - BigDecimal bigDecimal = new BigDecimal("100"); - try { - if(OrderInfoEnum.PAY_CHANNEL_1.getValue().equals(resources.getIsChannel())){ - miniPayService.refundOrder(resources.getOrderId(), - bigDecimal.multiply(resources.getPayPrice()).intValue()); - }else{ - payService.refundOrder(resources.getOrderId(), - bigDecimal.multiply(resources.getPayPrice()).intValue()); - } + @Override + public Map queryAll(List ids) { + List yxStoreOrders = this.list(new QueryWrapper().in("order_id",ids)); + List storeOrderDTOS = new ArrayList<>(); + for (YxStoreOrder yxStoreOrder :yxStoreOrders) { + YxStoreOrderDto yxStoreOrderDTO = generator.convert(yxStoreOrder,YxStoreOrderDto.class); - } catch (WxPayException e) { - log.info("refund-error:{}",e.getMessage()); + Integer _status = OrderUtil.orderStatus(yxStoreOrder.getPaid(),yxStoreOrder.getStatus(), + yxStoreOrder.getRefundStatus()); + + if(yxStoreOrder.getStoreId() > 0) { + String storeName = systemStoreService.getById(yxStoreOrder.getStoreId()).getName(); + yxStoreOrderDTO.setStoreName(storeName); } + //订单状态 + String orderStatusStr = OrderUtil.orderStatusStr(yxStoreOrder.getPaid() + ,yxStoreOrder.getStatus(),yxStoreOrder.getShippingType() + ,yxStoreOrder.getRefundStatus()); + + if(_status == 3){ + String refundTime = OrderUtil.stampToDate(String.valueOf(yxStoreOrder + .getRefundReasonTime())); + String str = "申请退款
"+ + "退款原因："+yxStoreOrder.getRefundReasonWap()+"
" + + "备注说明："+yxStoreOrder.getRefundReasonWapExplain()+"
" + + "退款时间："+refundTime+"
"; + orderStatusStr = str; + } + yxStoreOrderDTO.setStatusName(orderStatusStr); + + yxStoreOrderDTO.set_status(_status); + + String payTypeName = OrderUtil.payTypeName(yxStoreOrder.getPayType() + ,yxStoreOrder.getPaid()); + yxStoreOrderDTO.setPayTypeName(payTypeName); + + yxStoreOrderDTO.setPinkName(orderType(yxStoreOrder.getId() + ,yxStoreOrder.getPinkId(),yxStoreOrder.getCombinationId() + ,yxStoreOrder.getSeckillId(),yxStoreOrder.getBargainId(), + yxStoreOrder.getShippingType())); + + List cartInfos = storeOrderCartInfoService.list(new QueryWrapper().eq("oid",yxStoreOrder.getId())); + List cartInfoDTOS = new ArrayList<>(); + for (YxStoreOrderCartInfo cartInfo : cartInfos) { + StoreOrderCartInfoDTO cartInfoDTO = new StoreOrderCartInfoDTO(); + cartInfoDTO.setCartInfoMap(JSON.parseObject(cartInfo.getCartInfo())); + + cartInfoDTOS.add(cartInfoDTO); + } + yxStoreOrderDTO.setCartInfoList(cartInfoDTOS); + yxStoreOrderDTO.setUserDTO(generator.convert(userService.getById(yxStoreOrder.getUid()), YxUserDto.class)); + + storeOrderDTOS.add(yxStoreOrderDTO); + } + Map map = new LinkedHashMap<>(2); + map.put("content",storeOrderDTOS); + return map; } + @Override public String orderType(int id,int pinkId, int combinationId,int seckillId, int bargainId,int shippingType) { @@ -251,222 +391,63 @@ public class YxStoreOrderServiceImpl implements YxStoreOrderService { return str; } - @Override - public Map queryAll(YxStoreOrderQueryCriteria criteria, Pageable pageable){ - - Page page = yxStoreOrderRepository - .findAll((root, criteriaQuery, criteriaBuilder) - -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - List storeOrderDTOS = new ArrayList<>(); - for (YxStoreOrder yxStoreOrder : page.getContent()) { - YxStoreOrderDTO yxStoreOrderDTO = yxStoreOrderMapper.toDto(yxStoreOrder); - - - Integer _status = OrderUtil.orderStatus(yxStoreOrder.getPaid(),yxStoreOrder.getStatus(), - yxStoreOrder.getRefundStatus()); - - if(yxStoreOrder.getStoreId() > 0) { - String storeName = systemStoreService.findById(yxStoreOrder.getStoreId()).getName(); - yxStoreOrderDTO.setStoreName(storeName); - } - - //订单状态 - String orderStatusStr = OrderUtil.orderStatusStr(yxStoreOrder.getPaid() - ,yxStoreOrder.getStatus(),yxStoreOrder.getShippingType() - ,yxStoreOrder.getRefundStatus()); - - if(_status == 3){ - String refundTime = OrderUtil.stampToDate(String.valueOf(yxStoreOrder - .getRefundReasonTime())); - String str = "申请退款
"+ - "退款原因："+yxStoreOrder.getRefundReasonWap()+"
" + - "备注说明："+yxStoreOrder.getRefundReasonWapExplain()+"
" + - "退款时间："+refundTime+"
"; - orderStatusStr = str; - } - yxStoreOrderDTO.setStatusName(orderStatusStr); - - yxStoreOrderDTO.set_status(_status); - - String payTypeName = OrderUtil.payTypeName(yxStoreOrder.getPayType() - ,yxStoreOrder.getPaid()); - yxStoreOrderDTO.setPayTypeName(payTypeName); - - yxStoreOrderDTO.setPinkName(orderType(yxStoreOrder.getId() - ,yxStoreOrder.getPinkId(),yxStoreOrder.getCombinationId() - ,yxStoreOrder.getSeckillId(),yxStoreOrder.getBargainId(), - yxStoreOrder.getShippingType())); - - List cartInfos = yxStoreOrderCartInfoRepository - .findByOid(yxStoreOrder.getId()); - List cartInfoDTOS = new ArrayList<>(); - for (StoreOrderCartInfo cartInfo : cartInfos) { - StoreOrderCartInfoDTO cartInfoDTO = new StoreOrderCartInfoDTO(); - cartInfoDTO.setCartInfoMap(JSON.parseObject(cartInfo.getCartInfo())); - - cartInfoDTOS.add(cartInfoDTO); - } - yxStoreOrderDTO.setCartInfoList(cartInfoDTOS); - yxStoreOrderDTO.setUserDTO(userService.findById(yxStoreOrder.getUid())); - - storeOrderDTOS.add(yxStoreOrderDTO); - - } - - Map map = new LinkedHashMap<>(2); - map.put("content",storeOrderDTOS); - map.put("totalElements",page.getTotalElements()); - - return map; - } - @Override - public Map queryAll(List ids){ - List yxStoreOrders = yxStoreOrderRepository.findByOrderIdIn(ids); - List storeOrderDTOS = new ArrayList<>(); - for (YxStoreOrder yxStoreOrder :yxStoreOrders) { - YxStoreOrderDTO yxStoreOrderDTO = yxStoreOrderMapper.toDto(yxStoreOrder); - - - Integer _status = OrderUtil.orderStatus(yxStoreOrder.getPaid(),yxStoreOrder.getStatus(), - yxStoreOrder.getRefundStatus()); - - if(yxStoreOrder.getStoreId() > 0) { - String storeName = systemStoreService.findById(yxStoreOrder.getStoreId()).getName(); - yxStoreOrderDTO.setStoreName(storeName); - } - - //订单状态 - String orderStatusStr = OrderUtil.orderStatusStr(yxStoreOrder.getPaid() - ,yxStoreOrder.getStatus(),yxStoreOrder.getShippingType() - ,yxStoreOrder.getRefundStatus()); - - if(_status == 3){ - String refundTime = OrderUtil.stampToDate(String.valueOf(yxStoreOrder - .getRefundReasonTime())); - String str = "申请退款
"+ - "退款原因："+yxStoreOrder.getRefundReasonWap()+"
" + - "备注说明："+yxStoreOrder.getRefundReasonWapExplain()+"
" + - "退款时间："+refundTime+"
"; - orderStatusStr = str; - } - yxStoreOrderDTO.setStatusName(orderStatusStr); - - yxStoreOrderDTO.set_status(_status); - - String payTypeName = OrderUtil.payTypeName(yxStoreOrder.getPayType() - ,yxStoreOrder.getPaid()); - yxStoreOrderDTO.setPayTypeName(payTypeName); - - yxStoreOrderDTO.setPinkName(orderType(yxStoreOrder.getId() - ,yxStoreOrder.getPinkId(),yxStoreOrder.getCombinationId() - ,yxStoreOrder.getSeckillId(),yxStoreOrder.getBargainId(), - yxStoreOrder.getShippingType())); - - List cartInfos = yxStoreOrderCartInfoRepository - .findByOid(yxStoreOrder.getId()); - List cartInfoDTOS = new ArrayList<>(); - for (StoreOrderCartInfo cartInfo : cartInfos) { - StoreOrderCartInfoDTO cartInfoDTO = new StoreOrderCartInfoDTO(); - cartInfoDTO.setCartInfoMap(JSON.parseObject(cartInfo.getCartInfo())); - - cartInfoDTOS.add(cartInfoDTO); - } - yxStoreOrderDTO.setCartInfoList(cartInfoDTOS); - yxStoreOrderDTO.setUserDTO(userService.findById(yxStoreOrder.getUid())); - - storeOrderDTOS.add(yxStoreOrderDTO); - - } - - Map map = new LinkedHashMap<>(2); - map.put("content",storeOrderDTOS); - - return map; - } - @Override - public List queryAll(YxStoreOrderQueryCriteria criteria){ - return yxStoreOrderMapper.toDto(yxStoreOrderRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } - - @Override - public YxStoreOrderDTO findById(Integer id) { - Optional yxStoreOrder = yxStoreOrderRepository.findById(id); - ValidationUtil.isNull(yxStoreOrder,"YxStoreOrder","id",id); - return yxStoreOrderMapper.toDto(yxStoreOrder.get()); - } - @Override @Transactional(rollbackFor = Exception.class) - public YxStoreOrderDTO create(YxStoreOrder resources) { - if(yxStoreOrderRepository.findByUnique(resources.getUnique()) != null){ - throw new EntityExistException(YxStoreOrder.class,"unique",resources.getUnique()); + public void refund(YxStoreOrder resources) { + if(resources.getPayPrice().doubleValue() < 0){ + throw new BadRequestException("请输入退款金额"); } - return yxStoreOrderMapper.toDto(yxStoreOrderRepository.save(resources)); - } - @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxStoreOrder resources) { - Optional optionalYxStoreOrder = yxStoreOrderRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxStoreOrder,"YxStoreOrder","id",resources.getId()); - YxStoreOrder yxStoreOrder = optionalYxStoreOrder.get(); - YxStoreOrder yxStoreOrder1 = yxStoreOrderRepository.findByUnique(resources.getUnique()); - if(yxStoreOrder1 != null && !yxStoreOrder1.getId().equals(yxStoreOrder.getId())){ - throw new EntityExistException(YxStoreOrder.class,"unique",resources.getUnique()); - } - yxStoreOrder.copy(resources); - yxStoreOrderRepository.save(yxStoreOrder); - } + if(resources.getPayType().equals("yue")){ + //修改状态 + resources.setRefundStatus(2); + resources.setRefundPrice(resources.getPayPrice()); + this.save(resources); - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - yxStoreOrderRepository.deleteById(id); - } + //退款到余额 + YxUserDto userDTO = generator.convert(userService.getById(resources.getUid()),YxUserDto.class); + userMapper.updateMoney(resources.getPayPrice().doubleValue(), + resources.getUid()); + + YxUserBill userBill = new YxUserBill(); + userBill.setUid(resources.getUid()); + + userBill.setLinkId(resources.getId().toString()); + userBill.setPm(1); + userBill.setTitle("商品退款"); + userBill.setCategory("now_money"); + userBill.setType("pay_product_refund"); + userBill.setNumber(resources.getPayPrice()); + userBill.setBalance(NumberUtil.add(resources.getPayPrice(),userDTO.getNowMoney())); + userBill.setMark("订单退款到余额"); + userBill.setAddTime(OrderUtil.getSecondTimestampTwo()); + userBill.setStatus(1); + yxUserBillService.save(userBill); - @Override - public void download(List queryAll, HttpServletResponse response) throws IOException, ParseException { - List> list = new ArrayList<>(); + YxStoreOrderStatus storeOrderStatus = new YxStoreOrderStatus(); + storeOrderStatus.setOid(resources.getId()); + storeOrderStatus.setChangeType("refund_price"); + storeOrderStatus.setChangeMessage("退款给用户："+resources.getPayPrice() +"元"); + storeOrderStatus.setChangeTime(OrderUtil.getSecondTimestampTwo()); - for (YxStoreOrderDTO storeOrderDTO : queryAll) { - List storeList = new ArrayList(); - storeList = storeOrderDTO.getCartInfoList(); - if(storeList != null){ - for(StoreOrderCartInfoDTO storeOrderCartInfoDTO : storeList){ - Map map = new LinkedHashMap<>(); - map.put("订单号", storeOrderDTO.getOrderId()); - map.put("下单时间", OrderUtil.stampToDate(storeOrderDTO.getAddTime()+"")); - map.put("订单状态", storeOrderDTO.getStatusName()); - map.put("支付状态", storeOrderDTO.getPayTypeName()); - map.put("配送费用", storeOrderDTO.getFreightPrice()); - map.put("实际支付", storeOrderDTO.getPayPrice()); - - map.put("客户编号", storeOrderDTO.getUserDTO().getAccount()); - map.put("客户名称", storeOrderDTO.getUserDTO().getNickname()); - map.put("客户类型", storeOrderDTO.getUserDTO().getUserType()); - map.put("客户手机号码", storeOrderDTO.getUserDTO().getPhone()); - map.put("是否为推广员", storeOrderDTO.getUserDTO().getIsPromoter()); - - map.put("收货人", storeOrderDTO.getRealName()); - map.put("联系电话", storeOrderDTO.getUserPhone()); - map.put("收货地址", storeOrderDTO.getUserAddress()); - - Map proInfo = ((Map)storeOrderCartInfoDTO.getCartInfoMap().get("productInfo")); - map.put("商品编号", proInfo.get("id")); - map.put("商品名称", proInfo.get("store_name")); - map.put("商品规格", proInfo.get("unit_name")); - map.put("商品库存", proInfo.get("stock")); - map.put("单价", proInfo.get("price")); - map.put("订购数量", storeOrderDTO.getTotalNum()); - map.put("小计", storeOrderDTO.getTotalPrice()); - map.put("订单备注", storeOrderDTO.getMark()); - - list.add(map); + yxStoreOrderStatusService.save(storeOrderStatus); + }else{ + BigDecimal bigDecimal = new BigDecimal("100"); + try { + if(OrderInfoEnum.PAY_CHANNEL_1.getValue().equals(resources.getIsChannel())){ + miniPayService.refundOrder(resources.getOrderId(), + bigDecimal.multiply(resources.getPayPrice()).intValue()); + }else{ + payService.refundOrder(resources.getOrderId(), + bigDecimal.multiply(resources.getPayPrice()).intValue()); } + + } catch (WxPayException e) { + log.info("refund-error:{}",e.getMessage()); } + } - FileUtil.downloadExcel(list, response); } } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java index 9b548931..c823463d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java @@ -1,78 +1,78 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; -import co.yixiang.modules.shop.repository.YxStoreOrderStatusRepository; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxStoreOrderStatusService; -import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusDTO; +import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusDto; import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxStoreOrderStatusMapper; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2019-11-02 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxStoreOrderStatus") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreOrderStatusServiceImpl implements YxStoreOrderStatusService { +public class YxStoreOrderStatusServiceImpl extends BaseServiceImpl implements YxStoreOrderStatusService { - private final YxStoreOrderStatusRepository yxStoreOrderStatusRepository; - - private final YxStoreOrderStatusMapper yxStoreOrderStatusMapper; - - public YxStoreOrderStatusServiceImpl(YxStoreOrderStatusRepository yxStoreOrderStatusRepository, YxStoreOrderStatusMapper yxStoreOrderStatusMapper) { - this.yxStoreOrderStatusRepository = yxStoreOrderStatusRepository; - this.yxStoreOrderStatusMapper = yxStoreOrderStatusMapper; - } + private final IGenerator generator; @Override - public Map queryAll(YxStoreOrderStatusQueryCriteria criteria, Pageable pageable){ - Page page = yxStoreOrderStatusRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxStoreOrderStatusMapper::toDto)); + //@Cacheable + public Map queryAll(YxStoreOrderStatusQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxStoreOrderStatusDto.class)); + map.put("totalElements", page.getTotal()); + return map; } - @Override - public List queryAll(YxStoreOrderStatusQueryCriteria criteria){ - return yxStoreOrderStatusMapper.toDto(yxStoreOrderStatusRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } @Override - public YxStoreOrderStatusDTO findById(Integer id) { - Optional yxStoreOrderStatus = yxStoreOrderStatusRepository.findById(id); - ValidationUtil.isNull(yxStoreOrderStatus,"YxStoreOrderStatus","id",id); - return yxStoreOrderStatusMapper.toDto(yxStoreOrderStatus.get()); + //@Cacheable + public List queryAll(YxStoreOrderStatusQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreOrderStatus.class, criteria)); } - @Override - @Transactional(rollbackFor = Exception.class) - public YxStoreOrderStatusDTO create(YxStoreOrderStatus resources) { - return yxStoreOrderStatusMapper.toDto(yxStoreOrderStatusRepository.save(resources)); - } @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxStoreOrderStatus resources) { - Optional optionalYxStoreOrderStatus = yxStoreOrderStatusRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxStoreOrderStatus,"YxStoreOrderStatus","id",resources.getId()); - YxStoreOrderStatus yxStoreOrderStatus = optionalYxStoreOrderStatus.get(); - yxStoreOrderStatus.copy(resources); - yxStoreOrderStatusRepository.save(yxStoreOrderStatus); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - yxStoreOrderStatusRepository.deleteById(id); + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxStoreOrderStatusDto yxStoreOrderStatus : all) { + Map map = new LinkedHashMap<>(); + map.put("订单id", yxStoreOrderStatus.getOid()); + map.put("操作类型", yxStoreOrderStatus.getChangeType()); + map.put("操作备注", yxStoreOrderStatus.getChangeMessage()); + map.put("操作时间", yxStoreOrderStatus.getChangeTime()); + list.add(map); + } + FileUtil.downloadExcel(list, response); } } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java new file mode 100644 index 00000000..66174f18 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrResultServiceImpl.java @@ -0,0 +1,40 @@ +package co.yixiang.modules.shop.service.impl; + +import co.yixiang.modules.shop.domain.YxStoreProductAttrResult; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.FileUtil; +import co.yixiang.modules.shop.service.YxStoreProductAttrResultService; +import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrResultMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Map; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxStoreProductAttrResult") +@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) +public class YxStoreProductAttrResultServiceImpl extends BaseServiceImpl implements YxStoreProductAttrResultService { + + + +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java new file mode 100644 index 00000000..ebff0908 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrServiceImpl.java @@ -0,0 +1,39 @@ +package co.yixiang.modules.shop.service.impl; + +import co.yixiang.modules.shop.domain.YxStoreProductAttr; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.FileUtil; +import co.yixiang.modules.shop.service.YxStoreProductAttrService; +import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Map; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxStoreProductAttr") +@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) +public class YxStoreProductAttrServiceImpl extends BaseServiceImpl implements YxStoreProductAttrService { + + +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java new file mode 100644 index 00000000..0832934f --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductAttrValueServiceImpl.java @@ -0,0 +1,40 @@ +package co.yixiang.modules.shop.service.impl; + +import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.modules.shop.service.dto.YxStoreProductAttrValueQueryCriteria; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.FileUtil; +import co.yixiang.modules.shop.service.YxStoreProductAttrValueService; +import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrValueMapper; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Propagation; +import org.springframework.transaction.annotation.Transactional; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Pageable; + +import java.util.List; +import java.util.Map; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxStoreProductAttrValue") +@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) +public class YxStoreProductAttrValueServiceImpl extends BaseServiceImpl implements YxStoreProductAttrValueService { + + +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java index 35410213..2918360e 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java @@ -1,82 +1,88 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxStoreProductReply; -import co.yixiang.modules.shop.repository.YxStoreProductReplyRepository; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxStoreProductReplyService; -import co.yixiang.modules.shop.service.YxStoreProductService; -import co.yixiang.modules.shop.service.YxUserService; -import co.yixiang.modules.shop.service.dto.YxStoreProductReplyDTO; +import co.yixiang.modules.shop.service.dto.YxStoreProductReplyDto; import co.yixiang.modules.shop.service.dto.YxStoreProductReplyQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxStoreProductReplyMapper; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - -import java.util.*; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2019-11-03 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxStoreProductReply") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreProductReplyServiceImpl implements YxStoreProductReplyService { +public class YxStoreProductReplyServiceImpl extends BaseServiceImpl implements YxStoreProductReplyService { - private final YxStoreProductReplyRepository yxStoreProductReplyRepository; - - private final YxStoreProductReplyMapper yxStoreProductReplyMapper; - - - - public YxStoreProductReplyServiceImpl(YxStoreProductReplyRepository yxStoreProductReplyRepository, - YxStoreProductReplyMapper yxStoreProductReplyMapper) { - this.yxStoreProductReplyRepository = yxStoreProductReplyRepository; - this.yxStoreProductReplyMapper = yxStoreProductReplyMapper; - - } + private final IGenerator generator; @Override - public Map queryAll(YxStoreProductReplyQueryCriteria criteria, Pageable pageable){ - Page page = yxStoreProductReplyRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxStoreProductReplyMapper::toDto)); + //@Cacheable + public Map queryAll(YxStoreProductReplyQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxStoreProductReplyDto.class)); + map.put("totalElements", page.getTotal()); + return map; } - @Override - public List queryAll(YxStoreProductReplyQueryCriteria criteria){ - return yxStoreProductReplyMapper.toDto(yxStoreProductReplyRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } @Override - public YxStoreProductReplyDTO findById(Integer id) { - Optional yxStoreProductReply = yxStoreProductReplyRepository.findById(id); - ValidationUtil.isNull(yxStoreProductReply,"YxStoreProductReply","id",id); - return yxStoreProductReplyMapper.toDto(yxStoreProductReply.get()); + //@Cacheable + public List queryAll(YxStoreProductReplyQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreProductReply.class, criteria)); } - @Override - @Transactional(rollbackFor = Exception.class) - public YxStoreProductReplyDTO create(YxStoreProductReply resources) { - return yxStoreProductReplyMapper.toDto(yxStoreProductReplyRepository.save(resources)); - } @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxStoreProductReply resources) { - Optional optionalYxStoreProductReply = yxStoreProductReplyRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxStoreProductReply,"YxStoreProductReply","id",resources.getId()); - YxStoreProductReply yxStoreProductReply = optionalYxStoreProductReply.get(); - yxStoreProductReply.copy(resources); - yxStoreProductReplyRepository.save(yxStoreProductReply); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - yxStoreProductReplyRepository.deleteById(id); + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxStoreProductReplyDto yxStoreProductReply : all) { + Map map = new LinkedHashMap<>(); + map.put("用户ID", yxStoreProductReply.getUid()); + map.put("订单ID", yxStoreProductReply.getOid()); + map.put("唯一id", yxStoreProductReply.getUnique()); + map.put("产品id", yxStoreProductReply.getProductId()); + map.put("某种商品类型(普通商品、秒杀商品）", yxStoreProductReply.getReplyType()); + map.put("商品分数", yxStoreProductReply.getProductScore()); + map.put("服务分数", yxStoreProductReply.getServiceScore()); + map.put("评论内容", yxStoreProductReply.getComment()); + map.put("评论图片", yxStoreProductReply.getPics()); + map.put("评论时间", yxStoreProductReply.getAddTime()); + map.put("管理员回复内容", yxStoreProductReply.getMerchantReplyContent()); + map.put("管理员回复时间", yxStoreProductReply.getMerchantReplyTime()); + map.put("0未删除1已删除", yxStoreProductReply.getIsDel()); + map.put("0未回复1已回复", yxStoreProductReply.getIsReply()); + list.add(map); + } + FileUtil.downloadExcel(list, response); } } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java index ec11ebf0..1aa18c34 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java @@ -3,146 +3,153 @@ package co.yixiang.modules.shop.service.impl; import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; -import co.yixiang.constant.ShopConstants; import co.yixiang.exception.BadRequestException; import co.yixiang.modules.shop.domain.YxStoreProduct; +import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.domain.YxStoreProductAttr; import co.yixiang.modules.shop.domain.YxStoreProductAttrResult; import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; -import co.yixiang.modules.shop.repository.*; -import co.yixiang.modules.shop.service.YxStoreProductService; +import co.yixiang.modules.shop.service.YxStoreProductAttrResultService; +import co.yixiang.modules.shop.service.YxStoreProductAttrService; +import co.yixiang.modules.shop.service.YxStoreProductAttrValueService; import co.yixiang.modules.shop.service.dto.*; -import co.yixiang.modules.shop.service.mapper.YxStoreProductMapper; -import co.yixiang.utils.OrderUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; +import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrMapper; +import co.yixiang.modules.shop.service.mapper.YxStoreProductAttrValueMapper; +import co.yixiang.utils.*; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; -import org.springframework.cache.annotation.CacheEvict; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.modules.shop.service.YxStoreProductService; +import co.yixiang.modules.shop.service.mapper.YxStoreProductMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import java.math.BigDecimal; import java.util.*; +import java.io.IOException; import java.util.stream.Collectors; +import javax.servlet.http.HttpServletResponse; /** * @author hupeng -* @date 2019-10-04 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxStoreProduct") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxStoreProductServiceImpl implements YxStoreProductService { +public class YxStoreProductServiceImpl extends BaseServiceImpl implements YxStoreProductService { - private final YxStoreProductRepository yxStoreProductRepository; - private final YxStoreProductAttrRepository yxStoreProductAttrRepository; - private final YxStoreProductAttrValueRepository yxStoreProductAttrValueRepository; - private final YxStoreProductAttrResultRepository yxStoreProductAttrResultRepository; + private final IGenerator generator; - private final YxStoreProductMapper yxStoreProductMapper; + private final YxStoreProductMapper storeProductMapper; - public YxStoreProductServiceImpl(YxStoreProductRepository yxStoreProductRepository, - YxStoreProductAttrRepository yxStoreProductAttrRepository, YxStoreProductAttrValueRepository yxStoreProductAttrValueRepository, - YxStoreProductAttrResultRepository yxStoreProductAttrResultRepository, YxStoreProductMapper yxStoreProductMapper) { - this.yxStoreProductRepository = yxStoreProductRepository; - this.yxStoreProductAttrRepository = yxStoreProductAttrRepository; - this.yxStoreProductAttrValueRepository = yxStoreProductAttrValueRepository; - this.yxStoreProductAttrResultRepository = yxStoreProductAttrResultRepository; - this.yxStoreProductMapper = yxStoreProductMapper; - } + private final YxStoreProductAttrService yxStoreProductAttrService; + private final YxStoreProductAttrValueService yxStoreProductAttrValueService; + + private final YxStoreProductAttrResultService yxStoreProductAttrResultService; @Override - public Map queryAll(YxStoreProductQueryCriteria criteria, Pageable pageable){ - //criteria.setIsDel(0); - Page page = yxStoreProductRepository - .findAll((root, criteriaQuery, criteriaBuilder) - -> QueryHelp.getPredicate(root,criteria,criteriaBuilder) - ,pageable); - List storeProductDTOS = new ArrayList<>(); - for (YxStoreProduct product : page.getContent()) { - - YxStoreProductDTO yxStoreProductDTO = yxStoreProductMapper.toDto(product); - - //规格属性库存 - Integer newStock = yxStoreProductAttrValueRepository.sumStock(product.getId()); - if(newStock != null) yxStoreProductDTO.setStock(newStock); - - storeProductDTOS.add(yxStoreProductDTO); - } - Map map = new LinkedHashMap<>(2); - map.put("content",storeProductDTOS); - map.put("totalElements",page.getTotalElements()); + //@Cacheable + public Map queryAll(YxStoreProductQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxStoreProductDto.class)); + map.put("totalElements", page.getTotal()); return map; } + + @Override - public List queryAll(YxStoreProductQueryCriteria criteria){ - return yxStoreProductMapper.toDto(yxStoreProductRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + //@Cacheable + public List queryAll(YxStoreProductQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxStoreProduct.class, criteria)); + } + + + @Override + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxStoreProductDto yxStoreProduct : all) { + Map map = new LinkedHashMap<>(); + map.put("商户Id(0为总后台管理员创建,不为0的时候是商户后台创建)", yxStoreProduct.getMerId()); + map.put("商品图片", yxStoreProduct.getImage()); + map.put("轮播图", yxStoreProduct.getSliderImage()); + map.put("商品名称", yxStoreProduct.getStoreName()); + map.put("商品简介", yxStoreProduct.getStoreInfo()); + map.put("关键字", yxStoreProduct.getKeyword()); + map.put("产品条码（一维码）", yxStoreProduct.getBarCode()); + map.put("分类id", yxStoreProduct.getCateId()); + map.put("商品价格", yxStoreProduct.getPrice()); + map.put("会员价格", yxStoreProduct.getVipPrice()); + map.put("市场价", yxStoreProduct.getOtPrice()); + map.put("邮费", yxStoreProduct.getPostage()); + map.put("单位名", yxStoreProduct.getUnitName()); + map.put("排序", yxStoreProduct.getSort()); + map.put("销量", yxStoreProduct.getSales()); + map.put("库存", yxStoreProduct.getStock()); + map.put("状态（0：未上架，1：上架）", yxStoreProduct.getIsShow()); + map.put("是否热卖", yxStoreProduct.getIsHot()); + map.put("是否优惠", yxStoreProduct.getIsBenefit()); + map.put("是否精品", yxStoreProduct.getIsBest()); + map.put("是否新品", yxStoreProduct.getIsNew()); + map.put("产品描述", yxStoreProduct.getDescription()); + map.put("添加时间", yxStoreProduct.getAddTime()); + map.put("是否包邮", yxStoreProduct.getIsPostage()); + map.put("是否删除", yxStoreProduct.getIsDel()); + map.put("商户是否代理 0不可代理1可代理", yxStoreProduct.getMerUse()); + map.put("获得积分", yxStoreProduct.getGiveIntegral()); + map.put("成本价", yxStoreProduct.getCost()); + map.put("秒杀状态 0 未开启 1已开启", yxStoreProduct.getIsSeckill()); + map.put("砍价状态 0未开启 1开启", yxStoreProduct.getIsBargain()); + map.put("是否优品推荐", yxStoreProduct.getIsGood()); + map.put("虚拟销量", yxStoreProduct.getFicti()); + map.put("浏览量", yxStoreProduct.getBrowse()); + map.put("产品二维码地址(用户小程序海报)", yxStoreProduct.getCodePath()); + map.put("淘宝京东1688类型", yxStoreProduct.getSoureLink()); + list.add(map); + } + FileUtil.downloadExcel(list, response); } @Override - public YxStoreProductDTO findById(Integer id) { - Optional yxStoreProduct = yxStoreProductRepository.findById(id); - ValidationUtil.isNull(yxStoreProduct,"YxStoreProduct","id",id); - return yxStoreProductMapper.toDto(yxStoreProduct.get()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public YxStoreProductDTO create(YxStoreProduct resources) { - return yxStoreProductMapper.toDto(yxStoreProductRepository.save(resources)); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxStoreProduct resources) { - Optional optionalYxStoreProduct = yxStoreProductRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxStoreProduct,"YxStoreProduct","id",resources.getId()); - YxStoreProduct yxStoreProduct = optionalYxStoreProduct.get(); - yxStoreProduct.copy(resources); - yxStoreProductRepository.save(yxStoreProduct); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - yxStoreProductRepository.updateDel(1,id); - } - - @Override - @Transactional(rollbackFor = Exception.class) public void recovery(Integer id) { - yxStoreProductRepository.updateDel(0,id); - yxStoreProductRepository.updateOnsale(0,id); + storeProductMapper.updateDel(0,id); + storeProductMapper.updateOnsale(0,id); } @Override - @Transactional(rollbackFor = Exception.class) - public void onSale(Integer id, Integer status) { + public void onSale(Integer id, int status) { if(status == 1){ status = 0; }else{ status = 1; } - yxStoreProductRepository.updateOnsale(status,id); + storeProductMapper.updateOnsale(status,id); } @Override - @Transactional(rollbackFor = Exception.class) public List isFormatAttr(Integer id, String jsonStr) { if(ObjectUtil.isNull(id)) throw new BadRequestException("产品不存在"); - YxStoreProductDTO yxStoreProductDTO = findById(id); - + YxStoreProductDto yxStoreProductDTO = generator.convert(this.getById(id),YxStoreProductDto.class); DetailDTO detailDTO = attrFormat(jsonStr); - - //System.out.println("list:"+detailDTO.getRes()); List newList = new ArrayList<>(); for (Map> map : detailDTO.getRes()) { ProductFormatDTO productFormatDTO = new ProductFormatDTO(); - productFormatDTO.setDetail(map.get("detail")); productFormatDTO.setCost(yxStoreProductDTO.getCost().doubleValue()); productFormatDTO.setPrice(yxStoreProductDTO.getPrice().doubleValue()); @@ -150,10 +157,7 @@ public class YxStoreProductServiceImpl implements YxStoreProductService { productFormatDTO.setPic(yxStoreProductDTO.getImage()); productFormatDTO.setCheck(false); newList.add(productFormatDTO); - } - - return newList; } @@ -209,10 +213,10 @@ public class YxStoreProductServiceImpl implements YxStoreProductService { //保存属性 - yxStoreProductAttrRepository.saveAll(attrGroup); + yxStoreProductAttrService.saveBatch(attrGroup); //保存值 - yxStoreProductAttrValueRepository.saveAll(valueGroup); + yxStoreProductAttrValueService.saveBatch(valueGroup); Map map = new LinkedHashMap<>(); map.put("attr",jsonObject.get("items")); @@ -220,9 +224,7 @@ public class YxStoreProductServiceImpl implements YxStoreProductService { //保存结果 setResult(map,id); - } - @Override @Transactional(rollbackFor = Exception.class) public void setResult(Map map,Integer id) { @@ -231,9 +233,17 @@ public class YxStoreProductServiceImpl implements YxStoreProductService { yxStoreProductAttrResult.setResult(JSON.toJSONString(map)); yxStoreProductAttrResult.setChangeTime(OrderUtil.getSecondTimestampTwo()); - yxStoreProductAttrResultRepository.deleteByProductId(id); + yxStoreProductAttrService.remove(new QueryWrapper().eq("product_id",id)); - yxStoreProductAttrResultRepository.save(yxStoreProductAttrResult); + yxStoreProductAttrResultService.save(yxStoreProductAttrResult); + } + + @Override + public String getStoreProductAttrResult(Integer id) { + YxStoreProductAttrResult yxStoreProductAttrResult = yxStoreProductAttrResultService + .getOne(new QueryWrapper().eq("product_id",id)); + if(ObjectUtil.isNull(yxStoreProductAttrResult)) return ""; + return yxStoreProductAttrResult.getResult(); } @Override @@ -241,37 +251,24 @@ public class YxStoreProductServiceImpl implements YxStoreProductService { public void clearProductAttr(Integer id,boolean isActice) { if(ObjectUtil.isNull(id)) throw new BadRequestException("产品不存在"); - yxStoreProductAttrRepository.deleteByProductId(id); - yxStoreProductAttrValueRepository.deleteByProductId(id); + yxStoreProductAttrService.remove(new QueryWrapper().eq("product_id",id)); + yxStoreProductAttrValueService.remove(new QueryWrapper().eq("product_id",id)); if(isActice){ - yxStoreProductAttrResultRepository.deleteByProductId(id); + yxStoreProductAttrResultService.remove(new QueryWrapper().eq("product_id",id)); } } - - @Override - public String getStoreProductAttrResult(Integer id) { - YxStoreProductAttrResult yxStoreProductAttrResult = yxStoreProductAttrResultRepository - .findByProductId(id); - if(ObjectUtil.isNull(yxStoreProductAttrResult)) return ""; - return yxStoreProductAttrResult.getResult(); - } - /** * 组合规则属性算法 * @param jsonStr * @return */ public DetailDTO attrFormat(String jsonStr){ - // List returnList = new ArrayList<>(); - JSONObject jsonObject = JSON.parseObject(jsonStr); List fromatDetailDTOList = JSON.parseArray(jsonObject.get("items").toString(), FromatDetailDTO.class); List data = new ArrayList<>(); - //List>>> res =new ArrayList<>(); List>> res =new ArrayList<>(); - if(fromatDetailDTOList.size() > 1){ for (int i=0; i < fromatDetailDTOList.size() - 1;i++){ if(i == 0) data = fromatDetailDTOList.get(i).getDetail(); @@ -286,14 +283,9 @@ public class YxStoreProductServiceImpl implements YxStoreProductService { rep2 = v + "-" + fromatDetailDTOList.get(i+1).getValue() + "_" + g; } - tmp.add(rep2); - if(i == fromatDetailDTOList.size() - 2){ - // Map>> rep4 = new LinkedHashMap<>(); Map> rep4 = new LinkedHashMap<>(); - //List> listMap = new ArrayList<>(); - //Map map1 = new LinkedHashMap<>(); Map reptemp = new LinkedHashMap<>(); for (String h : Arrays.asList(rep2.split("-"))) { List rep3 = Arrays.asList(h.split("_")); @@ -303,19 +295,12 @@ public class YxStoreProductServiceImpl implements YxStoreProductService { }else{ reptemp.put(rep3.get(0),""); } - //listMap.add(reptemp); - } rep4.put("detail",reptemp); - - //rep4.put("detail",listMap); - res.add(rep4); } } - } - //System.out.println("tmp:"+tmp); if(!tmp.isEmpty()){ data = tmp; @@ -337,18 +322,12 @@ public class YxStoreProductServiceImpl implements YxStoreProductService { res.add(map2); } } - String s = StrUtil.join("-",dataArr); data.add(s); } - - DetailDTO detailDTO = new DetailDTO(); detailDTO.setData(data); detailDTO.setRes(res); - - return detailDTO; } - -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java index 3588e3e1..a32a38a9 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java @@ -1,85 +1,82 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxSystemConfig; -import co.yixiang.modules.shop.repository.YxSystemConfigRepository; +import co.yixiang.common.service.impl.BaseServiceImpl; +import co.yixiang.utils.*; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.modules.shop.service.YxSystemConfigService; -import co.yixiang.modules.shop.service.dto.YxSystemConfigDTO; +import co.yixiang.modules.shop.service.dto.YxSystemConfigDto; import co.yixiang.modules.shop.service.dto.YxSystemConfigQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxSystemConfigMapper; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2019-10-10 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxSystemConfig") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxSystemConfigServiceImpl implements YxSystemConfigService { +public class YxSystemConfigServiceImpl extends BaseServiceImpl implements YxSystemConfigService { - private final YxSystemConfigRepository yxSystemConfigRepository; + private final IGenerator generator; - private final YxSystemConfigMapper yxSystemConfigMapper; + @Override + //@Cacheable + public Map queryAll(YxSystemConfigQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxSystemConfigDto.class)); + map.put("totalElements", page.getTotal()); + return map; + } - public YxSystemConfigServiceImpl(YxSystemConfigRepository yxSystemConfigRepository, YxSystemConfigMapper yxSystemConfigMapper) { - this.yxSystemConfigRepository = yxSystemConfigRepository; - this.yxSystemConfigMapper = yxSystemConfigMapper; + + @Override + //@Cacheable + public List queryAll(YxSystemConfigQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxSystemConfig.class, criteria)); + } + + + @Override + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxSystemConfigDto yxSystemConfig : all) { + Map map = new LinkedHashMap<>(); + map.put("字段名称", yxSystemConfig.getMenuName()); + map.put("默认值", yxSystemConfig.getValue()); + map.put("排序", yxSystemConfig.getSort()); + map.put("是否隐藏", yxSystemConfig.getStatus()); + list.add(map); + } + FileUtil.downloadExcel(list, response); } @Override - public Map queryAll(YxSystemConfigQueryCriteria criteria, Pageable pageable){ - Page page = yxSystemConfigRepository - .findAll((root, criteriaQuery, criteriaBuilder) - -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxSystemConfigMapper::toDto)); + public YxSystemConfig findByKey(String key) { + return this.getOne(new QueryWrapper().eq("menu_name",key)); } - - @Override - public List queryAll(YxSystemConfigQueryCriteria criteria){ - return yxSystemConfigMapper.toDto(yxSystemConfigRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } - - @Override - public YxSystemConfigDTO findById(Integer id) { - Optional yxSystemConfig = yxSystemConfigRepository.findById(id); - ValidationUtil.isNull(yxSystemConfig,"YxSystemConfig","id",id); - return yxSystemConfigMapper.toDto(yxSystemConfig.get()); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public YxSystemConfigDTO create(YxSystemConfig resources) { - return yxSystemConfigMapper.toDto(yxSystemConfigRepository.save(resources)); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxSystemConfig resources) { - Optional optionalYxSystemConfig = yxSystemConfigRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxSystemConfig,"YxSystemConfig","id",resources.getId()); - YxSystemConfig yxSystemConfig = optionalYxSystemConfig.get(); - yxSystemConfig.copy(resources); - yxSystemConfigRepository.save(yxSystemConfig); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - yxSystemConfigRepository.deleteById(id); - } - - @Override - public YxSystemConfig findByKey(String str) { - return yxSystemConfigRepository.findByMenuName(str); - } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java index 3e711981..af2dcc11 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java @@ -1,93 +1,79 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxSystemGroupData; -import co.yixiang.modules.shop.repository.YxSystemGroupDataRepository; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxSystemGroupDataService; -import co.yixiang.modules.shop.service.dto.YxSystemGroupDataDTO; +import co.yixiang.modules.shop.service.dto.YxSystemGroupDataDto; import co.yixiang.modules.shop.service.dto.YxSystemGroupDataQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxSystemGroupDataMapper; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import com.alibaba.fastjson.JSON; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - -import java.util.*; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; +import java.util.List; +import java.util.Map; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2019-10-18 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxSystemGroupData") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxSystemGroupDataServiceImpl implements YxSystemGroupDataService { +public class YxSystemGroupDataServiceImpl extends BaseServiceImpl implements YxSystemGroupDataService { - private final YxSystemGroupDataRepository yxSystemGroupDataRepository; - - private final YxSystemGroupDataMapper yxSystemGroupDataMapper; - - public YxSystemGroupDataServiceImpl(YxSystemGroupDataRepository yxSystemGroupDataRepository, YxSystemGroupDataMapper yxSystemGroupDataMapper) { - this.yxSystemGroupDataRepository = yxSystemGroupDataRepository; - this.yxSystemGroupDataMapper = yxSystemGroupDataMapper; - } + private final IGenerator generator; @Override - public Map queryAll(YxSystemGroupDataQueryCriteria criteria, Pageable pageable){ - Page page = yxSystemGroupDataRepository - .findAll((root, criteriaQuery, criteriaBuilder) - -> QueryHelp.getPredicate(root,criteria,criteriaBuilder) - ,pageable); - List systemGroupDataDTOS = new ArrayList<>(); - for (YxSystemGroupData systemGroupData : page.getContent()) { - - YxSystemGroupDataDTO systemGroupDataDTO = yxSystemGroupDataMapper - .toDto(systemGroupData); - systemGroupDataDTO.setMap(JSON.parseObject(systemGroupData.getValue())); - systemGroupDataDTOS.add(systemGroupDataDTO); - } - Map map = new LinkedHashMap<>(2); - map.put("content",systemGroupDataDTOS); - map.put("totalElements",page.getTotalElements()); + //@Cacheable + public Map queryAll(YxSystemGroupDataQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxSystemGroupDataDto.class)); + map.put("totalElements", page.getTotal()); return map; } - @Override - public List queryAll(YxSystemGroupDataQueryCriteria criteria){ - return yxSystemGroupDataMapper.toDto(yxSystemGroupDataRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } @Override - public YxSystemGroupDataDTO findById(Integer id) { - Optional yxSystemGroupData = yxSystemGroupDataRepository.findById(id); - ValidationUtil.isNull(yxSystemGroupData,"YxSystemGroupData","id",id); - return yxSystemGroupDataMapper.toDto(yxSystemGroupData.get()); + //@Cacheable + public List queryAll(YxSystemGroupDataQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxSystemGroupData.class, criteria)); } + @Override - @Transactional(rollbackFor = Exception.class) - public YxSystemGroupDataDTO create(YxSystemGroupData resources) { - if(resources.getStatus() == null){ - resources.setStatus(1); + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxSystemGroupDataDto yxSystemGroupData : all) { + Map map = new LinkedHashMap<>(); + map.put("对应的数据名称", yxSystemGroupData.getGroupName()); + map.put("数据组对应的数据值（json数据）", yxSystemGroupData.getValue()); + map.put("添加数据时间", yxSystemGroupData.getAddTime()); + map.put("数据排序", yxSystemGroupData.getSort()); + map.put("状态（1：开启；2：关闭；）", yxSystemGroupData.getStatus()); + list.add(map); } - return yxSystemGroupDataMapper.toDto(yxSystemGroupDataRepository.save(resources)); + FileUtil.downloadExcel(list, response); } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxSystemGroupData resources) { - Optional optionalYxSystemGroupData = yxSystemGroupDataRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxSystemGroupData,"YxSystemGroupData","id",resources.getId()); - YxSystemGroupData yxSystemGroupData = optionalYxSystemGroupData.get(); - yxSystemGroupData.copy(resources); - yxSystemGroupDataRepository.save(yxSystemGroupData); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - yxSystemGroupDataRepository.deleteById(id); - } -} +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java index 84cbfe31..5e0d82b5 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreServiceImpl.java @@ -1,9 +1,14 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxSystemStore; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; -import co.yixiang.modules.shop.repository.YxSystemStoreRepository; import co.yixiang.modules.shop.service.YxSystemStoreService; import co.yixiang.modules.shop.service.dto.YxSystemStoreDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreQueryCriteria; @@ -28,67 +33,34 @@ import java.util.LinkedHashMap; /** * @author hupeng -* @date 2020-03-03 +* @date 2020-05-12 */ @Service +@AllArgsConstructor //@CacheConfig(cacheNames = "yxSystemStore") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxSystemStoreServiceImpl implements YxSystemStoreService { +public class YxSystemStoreServiceImpl extends BaseServiceImpl implements YxSystemStoreService { - private final YxSystemStoreRepository yxSystemStoreRepository; - - private final YxSystemStoreMapper yxSystemStoreMapper; - - public YxSystemStoreServiceImpl(YxSystemStoreRepository yxSystemStoreRepository, YxSystemStoreMapper yxSystemStoreMapper) { - this.yxSystemStoreRepository = yxSystemStoreRepository; - this.yxSystemStoreMapper = yxSystemStoreMapper; - } + private final IGenerator generator; @Override //@Cacheable - public Map queryAll(YxSystemStoreQueryCriteria criteria, Pageable pageable){ - Page page = yxSystemStoreRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxSystemStoreMapper::toDto)); + public Map queryAll(YxSystemStoreQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxSystemStoreDto.class)); + map.put("totalElements", page.getTotal()); + return map; } + @Override //@Cacheable - public List queryAll(YxSystemStoreQueryCriteria criteria){ - return yxSystemStoreMapper.toDto(yxSystemStoreRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + public List queryAll(YxSystemStoreQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxSystemStore.class, criteria)); } - @Override - //@Cacheable(key = "#p0") - public YxSystemStoreDto findById(Integer id) { - YxSystemStore yxSystemStore = yxSystemStoreRepository.findById(id).orElseGet(YxSystemStore::new); - ValidationUtil.isNull(yxSystemStore.getId(),"YxSystemStore","id",id); - return yxSystemStoreMapper.toDto(yxSystemStore); - } - - @Override - //@CacheEvict(allEntries = true) - @Transactional(rollbackFor = Exception.class) - public YxSystemStoreDto create(YxSystemStore resources) { - return yxSystemStoreMapper.toDto(yxSystemStoreRepository.save(resources)); - } - - @Override - //@CacheEvict(allEntries = true) - @Transactional(rollbackFor = Exception.class) - public void update(YxSystemStore resources) { - YxSystemStore yxSystemStore = yxSystemStoreRepository.findById(resources.getId()).orElseGet(YxSystemStore::new); - ValidationUtil.isNull( yxSystemStore.getId(),"YxSystemStore","id",resources.getId()); - yxSystemStore.copy(resources); - yxSystemStoreRepository.save(yxSystemStore); - } - - @Override - //@CacheEvict(allEntries = true) - public void deleteAll(Integer[] ids) { - for (Integer id : ids) { - yxSystemStoreRepository.deleteById(id); - } - } @Override public void download(List all, HttpServletResponse response) throws IOException { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java index a1ba489f..4bb308d6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemStoreStaffServiceImpl.java @@ -1,10 +1,14 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxSystemStoreStaff; -import co.yixiang.modules.shop.service.YxSystemStoreService; -import co.yixiang.modules.shop.service.dto.YxSystemStoreDto; -import co.yixiang.utils.*; -import co.yixiang.modules.shop.repository.YxSystemStoreStaffRepository; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxSystemStoreStaffService; import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffDto; import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffQueryCriteria; @@ -18,7 +22,8 @@ import org.springframework.transaction.annotation.Transactional; //import org.springframework.cache.annotation.Cacheable; import org.springframework.data.domain.Page; import org.springframework.data.domain.Pageable; - +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; import java.io.IOException; @@ -28,77 +33,34 @@ import java.util.LinkedHashMap; /** * @author hupeng -* @date 2020-03-22 +* @date 2020-05-12 */ @Service +@AllArgsConstructor //@CacheConfig(cacheNames = "yxSystemStoreStaff") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxSystemStoreStaffServiceImpl implements YxSystemStoreStaffService { +public class YxSystemStoreStaffServiceImpl extends BaseServiceImpl implements YxSystemStoreStaffService { - private final YxSystemStoreStaffRepository yxSystemStoreStaffRepository; - - private final YxSystemStoreStaffMapper yxSystemStoreStaffMapper; - - private final YxSystemStoreService systemStoreService; - - public YxSystemStoreStaffServiceImpl(YxSystemStoreStaffRepository yxSystemStoreStaffRepository, - YxSystemStoreStaffMapper yxSystemStoreStaffMapper, - YxSystemStoreService systemStoreService) { - this.yxSystemStoreStaffRepository = yxSystemStoreStaffRepository; - this.yxSystemStoreStaffMapper = yxSystemStoreStaffMapper; - this.systemStoreService = systemStoreService; - } + private final IGenerator generator; @Override //@Cacheable - public Map queryAll(YxSystemStoreStaffQueryCriteria criteria, Pageable pageable){ - Page page = yxSystemStoreStaffRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxSystemStoreStaffMapper::toDto)); + public Map queryAll(YxSystemStoreStaffQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxSystemStoreStaffDto.class)); + map.put("totalElements", page.getTotal()); + return map; } + @Override //@Cacheable - public List queryAll(YxSystemStoreStaffQueryCriteria criteria){ - return yxSystemStoreStaffMapper.toDto(yxSystemStoreStaffRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + public List queryAll(YxSystemStoreStaffQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxSystemStoreStaff.class, criteria)); } - @Override - //@Cacheable(key = "#p0") - public YxSystemStoreStaffDto findById(Integer id) { - YxSystemStoreStaff yxSystemStoreStaff = yxSystemStoreStaffRepository.findById(id).orElseGet(YxSystemStoreStaff::new); - ValidationUtil.isNull(yxSystemStoreStaff.getId(),"YxSystemStoreStaff","id",id); - return yxSystemStoreStaffMapper.toDto(yxSystemStoreStaff); - } - - @Override - //@CacheEvict(allEntries = true) - @Transactional(rollbackFor = Exception.class) - public YxSystemStoreStaffDto create(YxSystemStoreStaff resources) { - YxSystemStoreDto systemStoreDto = systemStoreService.findById(resources.getStoreId()); - resources.setStoreName(systemStoreDto.getName()); - resources.setAddTime(OrderUtil.getSecondTimestampTwo()); - return yxSystemStoreStaffMapper.toDto(yxSystemStoreStaffRepository.save(resources)); - } - - @Override - //@CacheEvict(allEntries = true) - @Transactional(rollbackFor = Exception.class) - public void update(YxSystemStoreStaff resources) { - YxSystemStoreDto systemStoreDto = systemStoreService.findById(resources.getStoreId()); - resources.setStoreName(systemStoreDto.getName()); - YxSystemStoreStaff yxSystemStoreStaff = yxSystemStoreStaffRepository.findById(resources.getId()).orElseGet(YxSystemStoreStaff::new); - ValidationUtil.isNull( yxSystemStoreStaff.getId(),"YxSystemStoreStaff","id",resources.getId()); - yxSystemStoreStaff.copy(resources); - yxSystemStoreStaffRepository.save(yxSystemStoreStaff); - } - - @Override - //@CacheEvict(allEntries = true) - public void deleteAll(Integer[] ids) { - for (Integer id : ids) { - yxSystemStoreStaffRepository.deleteById(id); - } - } @Override public void download(List all, HttpServletResponse response) throws IOException { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java index 9a3d27a6..5d32ba72 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java @@ -1,79 +1,88 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxSystemUserLevel; -import co.yixiang.modules.shop.repository.YxSystemUserLevelRepository; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxSystemUserLevelService; -import co.yixiang.modules.shop.service.dto.YxSystemUserLevelDTO; +import co.yixiang.modules.shop.service.dto.YxSystemUserLevelDto; import co.yixiang.modules.shop.service.dto.YxSystemUserLevelQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxSystemUserLevelMapper; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxSystemUserLevel") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxSystemUserLevelServiceImpl implements YxSystemUserLevelService { +public class YxSystemUserLevelServiceImpl extends BaseServiceImpl implements YxSystemUserLevelService { - private final YxSystemUserLevelRepository yxSystemUserLevelRepository; - - private final YxSystemUserLevelMapper yxSystemUserLevelMapper; - - public YxSystemUserLevelServiceImpl(YxSystemUserLevelRepository yxSystemUserLevelRepository, YxSystemUserLevelMapper yxSystemUserLevelMapper) { - this.yxSystemUserLevelRepository = yxSystemUserLevelRepository; - this.yxSystemUserLevelMapper = yxSystemUserLevelMapper; - } + private final IGenerator generator; @Override - public Map queryAll(YxSystemUserLevelQueryCriteria criteria, Pageable pageable){ - Page page = yxSystemUserLevelRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxSystemUserLevelMapper::toDto)); + //@Cacheable + public Map queryAll(YxSystemUserLevelQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxSystemUserLevelDto.class)); + map.put("totalElements", page.getTotal()); + return map; } - @Override - public List queryAll(YxSystemUserLevelQueryCriteria criteria){ - return yxSystemUserLevelMapper.toDto(yxSystemUserLevelRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } @Override - public YxSystemUserLevelDTO findById(Integer id) { - Optional yxSystemUserLevel = yxSystemUserLevelRepository.findById(id); - ValidationUtil.isNull(yxSystemUserLevel,"YxSystemUserLevel","id",id); - return yxSystemUserLevelMapper.toDto(yxSystemUserLevel.get()); + //@Cacheable + public List queryAll(YxSystemUserLevelQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxSystemUserLevel.class, criteria)); } - @Override - @Transactional(rollbackFor = Exception.class) - public YxSystemUserLevelDTO create(YxSystemUserLevel resources) { - return yxSystemUserLevelMapper.toDto(yxSystemUserLevelRepository.save(resources)); - } @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxSystemUserLevel resources) { - Optional optionalYxSystemUserLevel = yxSystemUserLevelRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxSystemUserLevel,"YxSystemUserLevel","id",resources.getId()); - YxSystemUserLevel yxSystemUserLevel = optionalYxSystemUserLevel.get(); - yxSystemUserLevel.copy(resources); - yxSystemUserLevelRepository.save(yxSystemUserLevel); + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxSystemUserLevelDto yxSystemUserLevel : all) { + Map map = new LinkedHashMap<>(); + map.put("商户id", yxSystemUserLevel.getMerId()); + map.put("会员名称", yxSystemUserLevel.getName()); + map.put("购买金额", yxSystemUserLevel.getMoney()); + map.put("有效时间", yxSystemUserLevel.getValidDate()); + map.put("是否为永久会员", yxSystemUserLevel.getIsForever()); + map.put("是否购买,1=购买,0=不购买", yxSystemUserLevel.getIsPay()); + map.put("是否显示 1=显示,0=隐藏", yxSystemUserLevel.getIsShow()); + map.put("会员等级", yxSystemUserLevel.getGrade()); + map.put("享受折扣", yxSystemUserLevel.getDiscount()); + map.put("会员卡背景", yxSystemUserLevel.getImage()); + map.put("会员图标", yxSystemUserLevel.getIcon()); + map.put("说明", yxSystemUserLevel.getExplain()); + map.put("添加时间", yxSystemUserLevel.getAddTime()); + map.put("是否删除.1=删除,0=未删除", yxSystemUserLevel.getIsDel()); + list.add(map); + } + FileUtil.downloadExcel(list, response); } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - yxSystemUserLevelRepository.deleteById(id); - } -} \ No newline at end of file +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java index ec3ddaaa..f1b2eaea 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java @@ -1,115 +1,84 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxSystemUserTask; -import co.yixiang.modules.shop.repository.YxSystemUserTaskRepository; -import co.yixiang.modules.shop.service.YxSystemUserLevelService; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxSystemUserTaskService; -import co.yixiang.modules.shop.service.dto.YxSystemUserTaskDTO; +import co.yixiang.modules.shop.service.dto.YxSystemUserTaskDto; import co.yixiang.modules.shop.service.dto.YxSystemUserTaskQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxSystemUserTaskMapper; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - -import java.util.LinkedHashMap; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxSystemUserTask") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxSystemUserTaskServiceImpl implements YxSystemUserTaskService { +public class YxSystemUserTaskServiceImpl extends BaseServiceImpl implements YxSystemUserTaskService { - private final YxSystemUserTaskRepository yxSystemUserTaskRepository; - - private final YxSystemUserTaskMapper yxSystemUserTaskMapper; - - private final YxSystemUserLevelService systemUserLevelService; - - public YxSystemUserTaskServiceImpl(YxSystemUserTaskRepository yxSystemUserTaskRepository, YxSystemUserTaskMapper yxSystemUserTaskMapper, YxSystemUserLevelService systemUserLevelService) { - this.yxSystemUserTaskRepository = yxSystemUserTaskRepository; - this.yxSystemUserTaskMapper = yxSystemUserTaskMapper; - this.systemUserLevelService = systemUserLevelService; - } + private final IGenerator generator; @Override - public Map queryAll(YxSystemUserTaskQueryCriteria criteria, Pageable pageable){ - - Page page = yxSystemUserTaskRepository - .findAll((root, criteriaQuery, criteriaBuilder) - -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - - List systemUserTaskDTOS = yxSystemUserTaskMapper - .toDto(page.getContent()); - for (YxSystemUserTaskDTO systemUserTaskDTO : systemUserTaskDTOS) { - systemUserTaskDTO.setLevalName(systemUserLevelService - .findById(systemUserTaskDTO.getLevelId()).getName()); - } - - Map map = new LinkedHashMap<>(2); - map.put("content",systemUserTaskDTOS); - map.put("totalElements",page.getTotalElements()); - + //@Cacheable + public Map queryAll(YxSystemUserTaskQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxSystemUserTaskDto.class)); + map.put("totalElements", page.getTotal()); return map; - } - @Override - public List queryAll(YxSystemUserTaskQueryCriteria criteria){ - return yxSystemUserTaskMapper.toDto(yxSystemUserTaskRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } @Override - public YxSystemUserTaskDTO findById(Integer id) { - Optional yxSystemUserTask = yxSystemUserTaskRepository.findById(id); - ValidationUtil.isNull(yxSystemUserTask,"YxSystemUserTask","id",id); - return yxSystemUserTaskMapper.toDto(yxSystemUserTask.get()); + //@Cacheable + public List queryAll(YxSystemUserTaskQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxSystemUserTask.class, criteria)); } - @Override - @Transactional(rollbackFor = Exception.class) - public YxSystemUserTaskDTO create(YxSystemUserTask resources) { - return yxSystemUserTaskMapper.toDto(yxSystemUserTaskRepository.save(resources)); - } @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxSystemUserTask resources) { - Optional optionalYxSystemUserTask = yxSystemUserTaskRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxSystemUserTask,"YxSystemUserTask","id",resources.getId()); - YxSystemUserTask yxSystemUserTask = optionalYxSystemUserTask.get(); - yxSystemUserTask.copy(resources); - yxSystemUserTaskRepository.save(yxSystemUserTask); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - yxSystemUserTaskRepository.deleteById(id); - } - - /** - * 任务类型 - * @return - */ - @Override - public List> getTaskType() { - List> list = null; - Map map = new LinkedHashMap<>(); - map.put("type","SatisfactionIntegral"); - map.put("type","SatisfactionIntegral"); - map.put("type","SatisfactionIntegral"); - map.put("type","SatisfactionIntegral"); - map.put("type","SatisfactionIntegral"); - map.put("type","SatisfactionIntegral"); - return null; + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxSystemUserTaskDto yxSystemUserTask : all) { + Map map = new LinkedHashMap<>(); + map.put("任务名称", yxSystemUserTask.getName()); + map.put("配置原名", yxSystemUserTask.getRealName()); + map.put("任务类型", yxSystemUserTask.getTaskType()); + map.put("限定数", yxSystemUserTask.getNumber()); + map.put("等级id", yxSystemUserTask.getLevelId()); + map.put("排序", yxSystemUserTask.getSort()); + map.put("是否显示", yxSystemUserTask.getIsShow()); + map.put("是否务必达成任务,1务必达成,0=满足其一", yxSystemUserTask.getIsMust()); + map.put("任务说明", yxSystemUserTask.getIllustrate()); + map.put("新增时间", yxSystemUserTask.getAddTime()); + list.add(map); + } + FileUtil.downloadExcel(list, response); } } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java index 994d8f4c..62058d8f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java @@ -1,82 +1,85 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxUserBill; -import co.yixiang.modules.shop.repository.YxUserBillRepository; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxUserBillService; -import co.yixiang.modules.shop.service.dto.YxUserBillDTO; +import co.yixiang.modules.shop.service.dto.YxUserBillDto; import co.yixiang.modules.shop.service.dto.YxUserBillQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxUserBillMapper; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - -import java.util.LinkedHashMap; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2019-11-06 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxUserBill") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxUserBillServiceImpl implements YxUserBillService { +public class YxUserBillServiceImpl extends BaseServiceImpl implements YxUserBillService { - private final YxUserBillRepository yxUserBillRepository; - - private final YxUserBillMapper yxUserBillMapper; - - public YxUserBillServiceImpl(YxUserBillRepository yxUserBillRepository, YxUserBillMapper yxUserBillMapper) { - this.yxUserBillRepository = yxUserBillRepository; - this.yxUserBillMapper = yxUserBillMapper; - } + private final IGenerator generator; @Override - public Map queryAll(YxUserBillQueryCriteria criteria, Pageable pageable){ - Page page = yxUserBillRepository.findAllByPageable(criteria.getCategory() - ,criteria.getType(),criteria.getNickname(),pageable); - Map map = new LinkedHashMap<>(2); - map.put("content",page.getContent()); - map.put("totalElements",page.getTotalElements()); + //@Cacheable + public Map queryAll(YxUserBillQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxUserBillDto.class)); + map.put("totalElements", page.getTotal()); return map; } - @Override - public List queryAll(YxUserBillQueryCriteria criteria){ - return yxUserBillMapper.toDto(yxUserBillRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } @Override - public YxUserBillDTO findById(Integer id) { - Optional yxUserBill = yxUserBillRepository.findById(id); - ValidationUtil.isNull(yxUserBill,"YxUserBill","id",id); - return yxUserBillMapper.toDto(yxUserBill.get()); + //@Cacheable + public List queryAll(YxUserBillQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxUserBill.class, criteria)); } - @Override - @Transactional(rollbackFor = Exception.class) - public YxUserBillDTO create(YxUserBill resources) { - return yxUserBillMapper.toDto(yxUserBillRepository.save(resources)); - } @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxUserBill resources) { - Optional optionalYxUserBill = yxUserBillRepository.findById(resources.getId()); - ValidationUtil.isNull( optionalYxUserBill,"YxUserBill","id",resources.getId()); - YxUserBill yxUserBill = optionalYxUserBill.get(); - yxUserBill.copy(resources); - yxUserBillRepository.save(yxUserBill); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer id) { - yxUserBillRepository.deleteById(id); + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxUserBillDto yxUserBill : all) { + Map map = new LinkedHashMap<>(); + map.put("用户uid", yxUserBill.getUid()); + map.put("关联id", yxUserBill.getLinkId()); + map.put("0 = 支出 1 = 获得", yxUserBill.getPm()); + map.put("账单标题", yxUserBill.getTitle()); + map.put("明细种类", yxUserBill.getCategory()); + map.put("明细类型", yxUserBill.getType()); + map.put("明细数字", yxUserBill.getNumber()); + map.put("剩余", yxUserBill.getBalance()); + map.put("备注", yxUserBill.getMark()); + map.put("添加时间", yxUserBill.getAddTime()); + map.put("0 = 带确定 1 = 有效 -1 = 无效", yxUserBill.getStatus()); + list.add(map); + } + FileUtil.downloadExcel(list, response); } } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserRechargeServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserRechargeServiceImpl.java index 8a50b417..412b0f2f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserRechargeServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserRechargeServiceImpl.java @@ -1,9 +1,14 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxUserRecharge; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; import co.yixiang.utils.ValidationUtil; import co.yixiang.utils.FileUtil; -import co.yixiang.modules.shop.repository.YxUserRechargeRepository; import co.yixiang.modules.shop.service.YxUserRechargeService; import co.yixiang.modules.shop.service.dto.YxUserRechargeDto; import co.yixiang.modules.shop.service.dto.YxUserRechargeQueryCriteria; @@ -11,7 +16,6 @@ import co.yixiang.modules.shop.service.mapper.YxUserRechargeMapper; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; -import co.yixiang.exception.EntityExistException; // 默认不使用缓存 //import org.springframework.cache.annotation.CacheConfig; //import org.springframework.cache.annotation.CacheEvict; @@ -29,61 +33,34 @@ import java.util.LinkedHashMap; /** * @author hupeng -* @date 2020-03-02 +* @date 2020-05-12 */ @Service +@AllArgsConstructor //@CacheConfig(cacheNames = "yxUserRecharge") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxUserRechargeServiceImpl implements YxUserRechargeService { +public class YxUserRechargeServiceImpl extends BaseServiceImpl implements YxUserRechargeService { - private final YxUserRechargeRepository yxUserRechargeRepository; - - private final YxUserRechargeMapper yxUserRechargeMapper; - - public YxUserRechargeServiceImpl(YxUserRechargeRepository yxUserRechargeRepository, YxUserRechargeMapper yxUserRechargeMapper) { - this.yxUserRechargeRepository = yxUserRechargeRepository; - this.yxUserRechargeMapper = yxUserRechargeMapper; - } + private final IGenerator generator; @Override //@Cacheable - public Map queryAll(YxUserRechargeQueryCriteria criteria, Pageable pageable){ - Page page = yxUserRechargeRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxUserRechargeMapper::toDto)); + public Map queryAll(YxUserRechargeQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxUserRechargeDto.class)); + map.put("totalElements", page.getTotal()); + return map; } + @Override //@Cacheable - public List queryAll(YxUserRechargeQueryCriteria criteria){ - return yxUserRechargeMapper.toDto(yxUserRechargeRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); + public List queryAll(YxUserRechargeQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxUserRecharge.class, criteria)); } - @Override - //@Cacheable(key = "#p0") - public YxUserRechargeDto findById(Integer id) { - YxUserRecharge yxUserRecharge = yxUserRechargeRepository.findById(id).orElseGet(YxUserRecharge::new); - ValidationUtil.isNull(yxUserRecharge.getId(),"YxUserRecharge","id",id); - return yxUserRechargeMapper.toDto(yxUserRecharge); - } - - @Override - //@CacheEvict(allEntries = true) - @Transactional(rollbackFor = Exception.class) - public YxUserRechargeDto create(YxUserRecharge resources) { - if(yxUserRechargeRepository.findByOrderId(resources.getOrderId()) != null){ - throw new EntityExistException(YxUserRecharge.class,"order_id",resources.getOrderId()); - } - return yxUserRechargeMapper.toDto(yxUserRechargeRepository.save(resources)); - } - - - @Override - //@CacheEvict(allEntries = true) - public void deleteAll(Integer[] ids) { - for (Integer id : ids) { - yxUserRechargeRepository.deleteById(id); - } - } @Override public void download(List all, HttpServletResponse response) throws IOException { diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java index 8619c11e..2de829f6 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java @@ -1,150 +1,133 @@ package co.yixiang.modules.shop.service.impl; -import cn.hutool.core.util.NumberUtil; import co.yixiang.modules.shop.domain.YxUser; -import co.yixiang.modules.shop.domain.YxUserBill; -import co.yixiang.modules.shop.repository.YxUserRepository; -import co.yixiang.modules.shop.service.YxUserBillService; -import co.yixiang.modules.shop.service.YxUserService; +import co.yixiang.common.service.impl.BaseServiceImpl; import co.yixiang.modules.shop.service.dto.UserMoneyDTO; -import co.yixiang.modules.shop.service.dto.YxUserDTO; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; +import co.yixiang.modules.shop.service.YxUserService; +import co.yixiang.modules.shop.service.dto.YxUserDto; import co.yixiang.modules.shop.service.dto.YxUserQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxUserMapper; -import co.yixiang.utils.OrderUtil; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - -import java.math.BigDecimal; +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2019-10-06 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxUser") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxUserServiceImpl implements YxUserService { +public class YxUserServiceImpl extends BaseServiceImpl implements YxUserService { - private final YxUserRepository yxUserRepository; + private final IGenerator generator; private final YxUserMapper yxUserMapper; - private final YxUserBillService yxUserBillService; - - public YxUserServiceImpl(YxUserRepository yxUserRepository, YxUserMapper yxUserMapper, YxUserBillService yxUserBillService) { - this.yxUserRepository = yxUserRepository; - this.yxUserMapper = yxUserMapper; - this.yxUserBillService = yxUserBillService; + @Override + //@Cacheable + public Map queryAll(YxUserQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxUserDto.class)); + map.put("totalElements", page.getTotal()); + return map; } - @Override - @Transactional(rollbackFor = Exception.class) - public void updateMoney(UserMoneyDTO param) { - YxUserDTO userDTO = findById(param.getUid()); - Double newMoney = 0d; - String mark = ""; - String type = "system_add"; - Integer pm = 1; - String title = "系统增加余额"; - if(param.getPtype() == 1){ - mark = "系统增加了"+param.getMoney()+"余额"; - newMoney = NumberUtil.add(userDTO.getNowMoney(),param.getMoney()).doubleValue(); - }else{ - title = "系统减少余额"; - mark = "系统扣除了"+param.getMoney()+"余额"; - type = "system_sub"; - pm = 0; - newMoney = NumberUtil.sub(userDTO.getNowMoney(),param.getMoney()).doubleValue(); - if(newMoney < 0) newMoney = 0d; + @Override + //@Cacheable + public List queryAll(YxUserQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxUser.class, criteria)); + } + + + @Override + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxUserDto yxUser : all) { + Map map = new LinkedHashMap<>(); + map.put("用户账户(跟accout一样)", yxUser.getUsername()); + map.put("用户账号", yxUser.getAccount()); + map.put("用户密码（跟pwd）", yxUser.getPassword()); + map.put("用户密码", yxUser.getPwd()); + map.put("真实姓名", yxUser.getRealName()); + map.put("生日", yxUser.getBirthday()); + map.put("身份证号码", yxUser.getCardId()); + map.put("用户备注", yxUser.getMark()); + map.put("合伙人id", yxUser.getPartnerId()); + map.put("用户分组id", yxUser.getGroupId()); + map.put("用户昵称", yxUser.getNickname()); + map.put("用户头像", yxUser.getAvatar()); + map.put("手机号码", yxUser.getPhone()); + map.put("添加时间", yxUser.getAddTime()); + map.put("添加ip", yxUser.getAddIp()); + map.put("最后一次登录时间", yxUser.getLastTime()); + map.put("最后一次登录ip", yxUser.getLastIp()); + map.put("用户余额", yxUser.getNowMoney()); + map.put("佣金金额", yxUser.getBrokeragePrice()); + map.put("用户剩余积分", yxUser.getIntegral()); + map.put("连续签到天数", yxUser.getSignNum()); + map.put("1为正常，0为禁止", yxUser.getStatus()); + map.put("等级", yxUser.getLevel()); + map.put("推广元id", yxUser.getSpreadUid()); + map.put("推广员关联时间", yxUser.getSpreadTime()); + map.put("用户类型", yxUser.getUserType()); + map.put("是否为推广员", yxUser.getIsPromoter()); + map.put("用户购买次数", yxUser.getPayCount()); + map.put("下级人数", yxUser.getSpreadCount()); + map.put("清理会员时间", yxUser.getCleanTime()); + map.put("详细地址", yxUser.getAddres()); + map.put("管理员编号 ", yxUser.getAdminid()); + map.put("用户登陆类型，h5,wechat,routine", yxUser.getLoginType()); + list.add(map); } - YxUser user = new YxUser(); - user.setUid(userDTO.getUid()); - user.setNowMoney(BigDecimal.valueOf(newMoney)); - update(user); - - YxUserBill userBill = new YxUserBill(); - userBill.setUid(userDTO.getUid()); - userBill.setLinkId("0"); - userBill.setPm(pm); - userBill.setTitle(title); - userBill.setCategory("now_money"); - userBill.setType(type); - userBill.setNumber(BigDecimal.valueOf(param.getMoney())); - userBill.setBalance(BigDecimal.valueOf(newMoney)); - userBill.setMark(mark); - userBill.setAddTime(OrderUtil.getSecondTimestampTwo()); - userBill.setStatus(1); - yxUserBillService.create(userBill); - } - - @Override - public Map queryAll(YxUserQueryCriteria criteria, Pageable pageable){ - Page page = yxUserRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxUserMapper::toDto)); - } - - @Override - public List queryAll(YxUserQueryCriteria criteria){ - return yxUserMapper.toDto(yxUserRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } - - @Override - public YxUserDTO findById(Integer uid) { - Optional yxUser = yxUserRepository.findById(uid); -// ValidationUtil.isNull(yxUser,"YxUser","uid",uid); - if(yxUser.isPresent()){ - return yxUserMapper.toDto(yxUser.get()); - } - return new YxUserDTO(); + FileUtil.downloadExcel(list, response); } @Override @Transactional(rollbackFor = Exception.class) - public YxUserDTO create(YxUser resources) { - return yxUserMapper.toDto(yxUserRepository.save(resources)); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxUser resources) { - Optional optionalYxUser = yxUserRepository.findById(resources.getUid()); - ValidationUtil.isNull( optionalYxUser,"YxUser","id",resources.getUid()); - YxUser yxUser = optionalYxUser.get(); - yxUser.copy(resources); - yxUserRepository.save(yxUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer uid) { - yxUserRepository.deleteById(uid); - } - - - @Override - @Transactional(rollbackFor = Exception.class) - public void onStatus(Integer uid, Integer status) { + public void onStatus(Integer uid, int status) { if(status == 1){ status = 0; }else{ status = 1; } - yxUserRepository.updateOnstatus(status,uid); + yxUserMapper.updateOnstatus(status,uid); } @Override @Transactional(rollbackFor = Exception.class) - public void incBrokeragePrice(double price, int uid) { - yxUserRepository.incBrokeragePrice(price,uid); + public void updateMoney(UserMoneyDTO param) { + //todo 修改用余额 + } + + @Override + public void incBrokeragePrice(double price, Integer uid) { + yxUserMapper.incBrokeragePrice(price,uid); } } diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java index 68fdda5f..772090e2 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java @@ -1,78 +1,97 @@ package co.yixiang.modules.shop.service.impl; import co.yixiang.modules.shop.domain.YxWechatUser; -import co.yixiang.modules.shop.repository.YxWechatUserRepository; +import co.yixiang.common.service.impl.BaseServiceImpl; +import lombok.AllArgsConstructor; +import co.yixiang.dozer.service.IGenerator; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; +import co.yixiang.common.utils.QueryHelpPlus; +import co.yixiang.utils.ValidationUtil; +import co.yixiang.utils.FileUtil; import co.yixiang.modules.shop.service.YxWechatUserService; -import co.yixiang.modules.shop.service.dto.YxWechatUserDTO; +import co.yixiang.modules.shop.service.dto.YxWechatUserDto; import co.yixiang.modules.shop.service.dto.YxWechatUserQueryCriteria; import co.yixiang.modules.shop.service.mapper.YxWechatUserMapper; -import co.yixiang.utils.PageUtil; -import co.yixiang.utils.QueryHelp; -import co.yixiang.utils.ValidationUtil; -import org.springframework.data.domain.Page; -import org.springframework.data.domain.Pageable; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; - +// 默认不使用缓存 +//import org.springframework.cache.annotation.CacheConfig; +//import org.springframework.cache.annotation.CacheEvict; +//import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Page; +import org.springframework.data.domain.Pageable; +import co.yixiang.utils.PageUtil; +import co.yixiang.utils.QueryHelp; import java.util.List; import java.util.Map; -import java.util.Optional; +import java.io.IOException; +import javax.servlet.http.HttpServletResponse; +import java.util.ArrayList; +import java.util.LinkedHashMap; /** * @author hupeng -* @date 2019-12-13 +* @date 2020-05-12 */ @Service +@AllArgsConstructor +//@CacheConfig(cacheNames = "yxWechatUser") @Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class) -public class YxWechatUserServiceImpl implements YxWechatUserService { +public class YxWechatUserServiceImpl extends BaseServiceImpl implements YxWechatUserService { - private final YxWechatUserRepository yxWechatUserRepository; - - private final YxWechatUserMapper yxWechatUserMapper; - - public YxWechatUserServiceImpl(YxWechatUserRepository yxWechatUserRepository, YxWechatUserMapper yxWechatUserMapper) { - this.yxWechatUserRepository = yxWechatUserRepository; - this.yxWechatUserMapper = yxWechatUserMapper; - } + private final IGenerator generator; @Override - public Map queryAll(YxWechatUserQueryCriteria criteria, Pageable pageable){ - Page page = yxWechatUserRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); - return PageUtil.toPage(page.map(yxWechatUserMapper::toDto)); + //@Cacheable + public Map queryAll(YxWechatUserQueryCriteria criteria, Pageable pageable) { + getPage(pageable); + PageInfo page = new PageInfo<>(queryAll(criteria)); + Map map = new LinkedHashMap<>(2); + map.put("content", generator.convert(page.getList(), YxWechatUserDto.class)); + map.put("totalElements", page.getTotal()); + return map; } - @Override - public List queryAll(YxWechatUserQueryCriteria criteria){ - return yxWechatUserMapper.toDto(yxWechatUserRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder))); - } @Override - public YxWechatUserDTO findById(Integer uid) { - Optional yxWechatUser = yxWechatUserRepository.findById(uid); - ValidationUtil.isNull(yxWechatUser,"YxWechatUser","uid",uid); - return yxWechatUserMapper.toDto(yxWechatUser.get()); + //@Cacheable + public List queryAll(YxWechatUserQueryCriteria criteria){ + return baseMapper.selectList(QueryHelpPlus.getPredicate(YxWechatUser.class, criteria)); } - @Override - @Transactional(rollbackFor = Exception.class) - public YxWechatUserDTO create(YxWechatUser resources) { - return yxWechatUserMapper.toDto(yxWechatUserRepository.save(resources)); - } @Override - @Transactional(rollbackFor = Exception.class) - public void update(YxWechatUser resources) { - Optional optionalYxWechatUser = yxWechatUserRepository.findById(resources.getUid()); - ValidationUtil.isNull( optionalYxWechatUser,"YxWechatUser","id",resources.getUid()); - YxWechatUser yxWechatUser = optionalYxWechatUser.get(); - yxWechatUser.copy(resources); - yxWechatUserRepository.save(yxWechatUser); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(Integer uid) { - yxWechatUserRepository.deleteById(uid); + public void download(List all, HttpServletResponse response) throws IOException { + List> list = new ArrayList<>(); + for (YxWechatUserDto yxWechatUser : all) { + Map map = new LinkedHashMap<>(); + map.put("只有在用户将公众号绑定到微信开放平台帐号后，才会出现该字段", yxWechatUser.getUnionid()); + map.put("用户的标识，对当前公众号唯一", yxWechatUser.getOpenid()); + map.put("小程序唯一身份ID", yxWechatUser.getRoutineOpenid()); + map.put("用户的昵称", yxWechatUser.getNickname()); + map.put("用户头像", yxWechatUser.getHeadimgurl()); + map.put("用户的性别，值为1时是男性，值为2时是女性，值为0时是未知", yxWechatUser.getSex()); + map.put("用户所在城市", yxWechatUser.getCity()); + map.put("用户的语言，简体中文为zh_CN", yxWechatUser.getLanguage()); + map.put("用户所在省份", yxWechatUser.getProvince()); + map.put("用户所在国家", yxWechatUser.getCountry()); + map.put("公众号运营者对粉丝的备注，公众号运营者可在微信公众平台用户管理界面对粉丝添加备注", yxWechatUser.getRemark()); + map.put("用户所在的分组ID（兼容旧的用户分组接口）", yxWechatUser.getGroupid()); + map.put("用户被打上的标签ID列表", yxWechatUser.getTagidList()); + map.put("用户是否订阅该公众号标识", yxWechatUser.getSubscribe()); + map.put("关注公众号时间", yxWechatUser.getSubscribeTime()); + map.put("添加时间", yxWechatUser.getAddTime()); + map.put("一级推荐人", yxWechatUser.getStair()); + map.put("二级推荐人", yxWechatUser.getSecond()); + map.put("一级推荐人订单", yxWechatUser.getOrderStair()); + map.put("二级推荐人订单", yxWechatUser.getOrderSecond()); + map.put("佣金", yxWechatUser.getNowMoney()); + map.put("小程序用户会话密匙", yxWechatUser.getSessionKey()); + map.put("用户类型", yxWechatUser.getUserType()); + list.add(map); + } + FileUtil.downloadExcel(list, response); } } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxExpressMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxExpressMapper.java index 13bb1c8b..6b1ca6a4 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxExpressMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxExpressMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxExpress; -import co.yixiang.modules.shop.service.dto.YxExpressDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-12-12 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxExpressMapper extends EntityMapper { +@Repository +@Mapper +public interface YxExpressMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialGroupMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialGroupMapper.java index 7c193c62..4179bc8d 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialGroupMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialGroupMapper.java @@ -1,17 +1,16 @@ package co.yixiang.modules.shop.service.mapper; - -import co.yixiang.base.BaseMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxMaterialGroup; -import co.yixiang.modules.shop.service.dto.YxMaterialGroupDto; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxMaterialGroupMapper extends BaseMapper { +@Repository +@Mapper +public interface YxMaterialGroupMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialMapper.java index f91d1e88..8d9c8b6b 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxMaterialMapper.java @@ -1,17 +1,16 @@ package co.yixiang.modules.shop.service.mapper; - -import co.yixiang.base.BaseMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxMaterial; -import co.yixiang.modules.shop.service.dto.YxMaterialDto; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2020-01-09 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxMaterialMapper extends BaseMapper { +@Repository +@Mapper +public interface YxMaterialMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCartMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCartMapper.java new file mode 100644 index 00000000..feea3c46 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCartMapper.java @@ -0,0 +1,25 @@ +package co.yixiang.modules.shop.service.mapper; + +import co.yixiang.common.mapper.CoreMapper; +import co.yixiang.modules.shop.domain.YxStoreCart; +import co.yixiang.modules.shop.service.dto.CountDto; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import java.util.List; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Repository +@Mapper +public interface YxStoreCartMapper extends CoreMapper { + @Select("SELECT t.cate_name as catename from yx_store_cart c " + + "LEFT JOIN yx_store_product p on c.product_id = p.id " + + "LEFT JOIN yx_store_category t on p.cate_id = t.id " + + "WHERE c.is_pay = 1") + List findCateName(); +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java index 16598d5e..d0da4e07 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreCategoryMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxStoreCategory; -import co.yixiang.modules.shop.service.dto.YxStoreCategoryDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-10-03 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxStoreCategoryMapper extends EntityMapper { +@Repository +@Mapper +public interface YxStoreCategoryMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderCartInfoMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderCartInfoMapper.java new file mode 100644 index 00000000..a1b06c9f --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderCartInfoMapper.java @@ -0,0 +1,16 @@ +package co.yixiang.modules.shop.service.mapper; + +import co.yixiang.common.mapper.CoreMapper; +import co.yixiang.modules.shop.domain.YxStoreOrderCartInfo; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Repository +@Mapper +public interface YxStoreOrderCartInfoMapper extends CoreMapper { + +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java index a81b6bd8..84bbbcc0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderMapper.java @@ -1,16 +1,41 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxStoreOrder; -import co.yixiang.modules.shop.service.dto.YxStoreOrderDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import co.yixiang.modules.shop.service.dto.ChartDataDTO; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; + +import java.util.List; /** * @author hupeng -* @date 2019-10-14 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxStoreOrderMapper extends EntityMapper { +@Repository +@Mapper +public interface YxStoreOrderMapper extends CoreMapper { -} \ No newline at end of file +// todo Integer countByPayTimeGreaterThanEqual(int today); +// +// todo Integer countByPayTimeLessThanAndPayTimeGreaterThanEqual(int today, int yesterday); + @Select( "select IFNULL(sum(pay_price),0) from yx_store_order " + + "where refund_status=0 and is_del=0 and paid=1") + Double sumTotalPrice(); + + @Select("SELECT IFNULL(sum(pay_price),0) as num," + + "FROM_UNIXTIME(add_time, '%m-%d') as time " + + " FROM yx_store_order where refund_status=0 and is_del=0 and paid=1 and pay_time >= ${time}" + + " GROUP BY FROM_UNIXTIME(add_time,'%Y-%m-%d') " + + " ORDER BY add_time ASC") + List chartList(@Param("time") int time); + @Select("SELECT count(id) as num," + + "FROM_UNIXTIME(add_time, '%m-%d') as time " + + " FROM yx_store_order where refund_status=0 and is_del=0 and paid=1 and pay_time >= ${time}" + + " GROUP BY FROM_UNIXTIME(add_time,'%Y-%m-%d') " + + " ORDER BY add_time ASC") + List chartListT(@Param("time")int time); +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java index 17ffa234..6890ca35 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreOrderStatusMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxStoreOrderStatus; -import co.yixiang.modules.shop.service.dto.YxStoreOrderStatusDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-11-02 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxStoreOrderStatusMapper extends EntityMapper { +@Repository +@Mapper +public interface YxStoreOrderStatusMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrMapper.java new file mode 100644 index 00000000..f09cef2f --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrMapper.java @@ -0,0 +1,16 @@ +package co.yixiang.modules.shop.service.mapper; + +import co.yixiang.common.mapper.CoreMapper; +import co.yixiang.modules.shop.domain.YxStoreProductAttr; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Repository +@Mapper +public interface YxStoreProductAttrMapper extends CoreMapper { + +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrResultMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrResultMapper.java new file mode 100644 index 00000000..9c7d02de --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrResultMapper.java @@ -0,0 +1,16 @@ +package co.yixiang.modules.shop.service.mapper; + +import co.yixiang.common.mapper.CoreMapper; +import co.yixiang.modules.shop.domain.YxStoreProductAttrResult; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Repository +@Mapper +public interface YxStoreProductAttrResultMapper extends CoreMapper { + +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrValueMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrValueMapper.java new file mode 100644 index 00000000..3bb7f327 --- /dev/null +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductAttrValueMapper.java @@ -0,0 +1,16 @@ +package co.yixiang.modules.shop.service.mapper; + +import co.yixiang.common.mapper.CoreMapper; +import co.yixiang.modules.shop.domain.YxStoreProductAttrValue; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; + +/** +* @author hupeng +* @date 2020-05-12 +*/ +@Repository +@Mapper +public interface YxStoreProductAttrValueMapper extends CoreMapper { + +} \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java index 35a2709e..1ef98152 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductMapper.java @@ -1,17 +1,23 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxStoreProduct; -import co.yixiang.modules.shop.service.dto.YxStoreProductDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; - +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Select; +import org.apache.ibatis.annotations.Update; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-10-04 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxStoreProductMapper extends EntityMapper { +@Repository +@Mapper +public interface YxStoreProductMapper extends CoreMapper { -} \ No newline at end of file + @Update("update yx_store_product set is_show = #{i} where id = #{id}") + void updateDel(@Param("i")int i,@Param("id") Integer id); + @Update("update yx_store_product set is_del = #{i} where id = #{id}") + void updateOnsale(@Param("i")int i, @Param("id")Integer id); +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java index dd07d295..7e79097f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxStoreProductReplyMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxStoreProductReply; -import co.yixiang.modules.shop.service.dto.YxStoreProductReplyDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-11-03 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxStoreProductReplyMapper extends EntityMapper { +@Repository +@Mapper +public interface YxStoreProductReplyMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemConfigMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemConfigMapper.java index 4ccd302f..38f6ea86 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemConfigMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemConfigMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxSystemConfig; -import co.yixiang.modules.shop.service.dto.YxSystemConfigDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-10-10 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxSystemConfigMapper extends EntityMapper { +@Repository +@Mapper +public interface YxSystemConfigMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java index ba1a8112..4489d054 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemGroupDataMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxSystemGroupData; -import co.yixiang.modules.shop.service.dto.YxSystemGroupDataDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-10-18 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxSystemGroupDataMapper extends EntityMapper { +@Repository +@Mapper +public interface YxSystemGroupDataMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreMapper.java index b8d2d837..6c6338b0 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.base.BaseMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxSystemStore; -import co.yixiang.modules.shop.service.dto.YxSystemStoreDto; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2020-03-03 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxSystemStoreMapper extends BaseMapper { +@Repository +@Mapper +public interface YxSystemStoreMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreStaffMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreStaffMapper.java index 205d5249..14355aab 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreStaffMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemStoreStaffMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.base.BaseMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxSystemStoreStaff; -import co.yixiang.modules.shop.service.dto.YxSystemStoreStaffDto; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2020-03-22 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxSystemStoreStaffMapper extends BaseMapper { +@Repository +@Mapper +public interface YxSystemStoreStaffMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java index 11432b16..c496a821 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserLevelMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxSystemUserLevel; -import co.yixiang.modules.shop.service.dto.YxSystemUserLevelDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxSystemUserLevelMapper extends EntityMapper { +@Repository +@Mapper +public interface YxSystemUserLevelMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java index 74d4ec32..1ae4b126 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxSystemUserTaskMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxSystemUserTask; -import co.yixiang.modules.shop.service.dto.YxSystemUserTaskDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-12-04 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxSystemUserTaskMapper extends EntityMapper { +@Repository +@Mapper +public interface YxSystemUserTaskMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java index 8eedb2b5..bd934a30 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserBillMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxUserBill; -import co.yixiang.modules.shop.service.dto.YxUserBillDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-11-06 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxUserBillMapper extends EntityMapper { +@Repository +@Mapper +public interface YxUserBillMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java index 474a605b..bbb032be 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserMapper.java @@ -1,16 +1,29 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxUser; -import co.yixiang.modules.shop.service.dto.YxUserDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; +import org.apache.ibatis.annotations.Update; +import org.springframework.data.jpa.repository.Modifying; +import org.springframework.data.jpa.repository.Query; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-10-06 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxUserMapper extends EntityMapper { +@Repository +@Mapper +public interface YxUserMapper extends CoreMapper { -} \ No newline at end of file + @Update( "update yx_user set status = #{status} where uid = #{id}") + void updateOnstatus(@Param("status") int status, @Param("id") int id); + + @Update( "update yx_user set now_money = now_money + ${money} where uid = #{id}") + void updateMoney(@Param("money") double money, @Param("id")int id); + + @Update("update yx_user set brokerage_price = brokerage_price+ ${price} where uid = #{id}") + void incBrokeragePrice(@Param("price")double price,@Param("id") int id); + +} diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserRechargeMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserRechargeMapper.java index 6ab8ae4f..ca113a1f 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserRechargeMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxUserRechargeMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.base.BaseMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxUserRecharge; -import co.yixiang.modules.shop.service.dto.YxUserRechargeDto; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2020-03-02 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring", unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxUserRechargeMapper extends BaseMapper { +@Repository +@Mapper +public interface YxUserRechargeMapper extends CoreMapper { } \ No newline at end of file diff --git a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxWechatUserMapper.java b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxWechatUserMapper.java index d294c4a7..6b86a916 100644 --- a/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxWechatUserMapper.java +++ b/yshop-shop/src/main/java/co/yixiang/modules/shop/service/mapper/YxWechatUserMapper.java @@ -1,16 +1,16 @@ package co.yixiang.modules.shop.service.mapper; -import co.yixiang.mapper.EntityMapper; +import co.yixiang.common.mapper.CoreMapper; import co.yixiang.modules.shop.domain.YxWechatUser; -import co.yixiang.modules.shop.service.dto.YxWechatUserDTO; -import org.mapstruct.Mapper; -import org.mapstruct.ReportingPolicy; +import org.apache.ibatis.annotations.Mapper; +import org.springframework.stereotype.Repository; /** * @author hupeng -* @date 2019-12-13 +* @date 2020-05-12 */ -@Mapper(componentModel = "spring",uses = {},unmappedTargetPolicy = ReportingPolicy.IGNORE) -public interface YxWechatUserMapper extends EntityMapper { +@Repository +@Mapper +public interface YxWechatUserMapper extends CoreMapper { } \ No newline at end of file