cxc/yshopb2c
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

商城模块 微信模块优化

Browse Source
This commit is contained in:
hupeng
2020-02-24 16:28:51 +08:00
parent 4e3caff398
commit 38cc78b3e7
46 changed files with 408 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
yshop-common/src/main/java/co/yixiang/utils/OrderUtil.java
View File

@ -49,6 +49,15 @@ public class OrderUtil {
return res;
}
/*
* 将时间戳转换为date
*/
public static Date stampToDateObj(String s){
long lt = new Long(s) * 1000;
Date date = new Date(lt);
return date;
}
/**
* 获取精确到秒的时间戳

13
yshop-mp/src/main/java/co/yixiang/mp/controller/YxArticleController.java → yshop-mp/src/main/java/co/yixiang/mp/controller/WechatArticleController.java
View File

@ -1,15 +1,12 @@
package co.yixiang.mp.controller;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.exception.BadRequestException;
import co.yixiang.mp.domain.YxArticle;
import co.yixiang.mp.service.YxArticleService;
import co.yixiang.mp.service.dto.YxArticleDTO;
import co.yixiang.mp.service.dto.YxArticleQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@ -23,14 +20,16 @@ import java.util.Date;
* @author hupeng
* @date 2019-10-07
*/
@Api(tags = "图文管理")
@Api(tags = "商城:微信图文管理")
@RestController
@RequestMapping("api")
public class YxArticleController {
public class WechatArticleController {
@Autowired
private YxArticleService yxArticleService;
private final YxArticleService yxArticleService;
public WechatArticleController(YxArticleService yxArticleService) {
this.yxArticleService = yxArticleService;
}
@ApiOperation(value = "查询")
@GetMapping(value = "/yxArticle")

11
yshop-mp/src/main/java/co/yixiang/mp/controller/YxCacheController.java → yshop-mp/src/main/java/co/yixiang/mp/controller/WechatMenuController.java
View File

@ -25,15 +25,16 @@ import org.springframework.web.bind.annotation.*;
* @author hupeng
* @date 2019-10-06
*/
@Api(tags = "微信菜單")
@Api(tags = "商城:微信菜單")
@RestController
@RequestMapping("api")
public class YxCacheController {
@Autowired
private YxCacheService yxCacheService;
public class WechatMenuController {
private final YxCacheService yxCacheService;
public WechatMenuController(YxCacheService yxCacheService) {
this.yxCacheService = yxCacheService;
}
@ApiOperation(value = "查询菜单")
@GetMapping(value = "/yxCache")

12
yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatReplyController.java → yshop-mp/src/main/java/co/yixiang/mp/controller/WechatReplyController.java
View File

@ -1,8 +1,6 @@
package co.yixiang.mp.controller;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.exception.BadRequestException;
import co.yixiang.mp.domain.YxWechatReply;
import co.yixiang.mp.service.YxWechatReplyService;
import com.alibaba.fastjson.JSON;
@ -19,14 +17,16 @@ import org.springframework.web.bind.annotation.*;
* @author hupeng
* @date 2019-10-10
*/
@Api(tags = "微信回復管理")
@Api(tags = "商城:微信回復管理")
@RestController
@RequestMapping("api")
public class YxWechatReplyController {
public class WechatReplyController {
@Autowired
private YxWechatReplyService yxWechatReplyService;
private final YxWechatReplyService yxWechatReplyService;
public WechatReplyController(YxWechatReplyService yxWechatReplyService) {
this.yxWechatReplyService = yxWechatReplyService;
}
@ApiOperation(value = "查询")
@GetMapping(value = "/yxWechatReply")

13
yshop-mp/src/main/java/co/yixiang/mp/controller/YxWechatTemplateController.java → yshop-mp/src/main/java/co/yixiang/mp/controller/WechatTemplateController.java
View File

@ -1,7 +1,5 @@
package co.yixiang.mp.controller;
import cn.hutool.core.util.StrUtil;
import co.yixiang.exception.BadRequestException;
import co.yixiang.mp.domain.YxWechatTemplate;
import co.yixiang.mp.service.YxWechatTemplateService;
import co.yixiang.mp.service.dto.YxWechatTemplateQueryCriteria;
@ -19,13 +17,16 @@ import org.springframework.web.bind.annotation.*;
* @author xuwenbo
* @date 2019-12-10
*/
@Api(tags = "微信模板管理")
@Api(tags = "商城:微信模板管理")
@RestController
@RequestMapping("api")
public class YxWechatTemplateController {
public class WechatTemplateController {
@Autowired
private YxWechatTemplateService yxWechatTemplateService;
private final YxWechatTemplateService yxWechatTemplateService;
public WechatTemplateController(YxWechatTemplateService yxWechatTemplateService) {
this.yxWechatTemplateService = yxWechatTemplateService;
}
@ApiOperation(value = "查询")
@GetMapping(value = "/yxWechatTemplate")

11
yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxArticleServiceImpl.java
View File

@ -28,7 +28,6 @@ import me.chanjar.weixin.mp.bean.material.WxMpMaterialNews;
import me.chanjar.weixin.mp.bean.material.WxMpMaterialUploadResult;
import me.chanjar.weixin.mp.bean.result.WxMpMassSendResult;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@ -50,12 +49,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxArticleServiceImpl implements YxArticleService {
@Autowired
private YxArticleRepository yxArticleRepository;
private final YxArticleRepository yxArticleRepository;
@Autowired
private YxArticleMapper yxArticleMapper;
private final YxArticleMapper yxArticleMapper;
public YxArticleServiceImpl(YxArticleRepository yxArticleRepository, YxArticleMapper yxArticleMapper) {
this.yxArticleRepository = yxArticleRepository;
this.yxArticleMapper = yxArticleMapper;
}
@Value("${file.path}")
private String uploadDirStr;

12
yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxCacheServiceImpl.java
View File

@ -10,7 +10,6 @@ import co.yixiang.mp.service.mapper.YxCacheMapper;
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;
@ -29,11 +28,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxCacheServiceImpl implements YxCacheService {
@Autowired
private YxCacheRepository yxCacheRepository;
private final YxCacheRepository yxCacheRepository;
@Autowired
private YxCacheMapper yxCacheMapper;
private final YxCacheMapper yxCacheMapper;
public YxCacheServiceImpl(YxCacheRepository yxCacheRepository, YxCacheMapper yxCacheMapper) {
this.yxCacheRepository = yxCacheRepository;
this.yxCacheMapper = yxCacheMapper;
}
@Override
public Map<String,Object> queryAll(YxCacheQueryCriteria criteria, Pageable pageable){

12
yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatReplyServiceImpl.java
View File

@ -10,7 +10,6 @@ import co.yixiang.mp.service.mapper.YxWechatReplyMapper;
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;
@ -29,11 +28,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxWechatReplyServiceImpl implements YxWechatReplyService {
@Autowired
private YxWechatReplyRepository yxWechatReplyRepository;
private final YxWechatReplyRepository yxWechatReplyRepository;
@Autowired
private YxWechatReplyMapper yxWechatReplyMapper;
private final YxWechatReplyMapper yxWechatReplyMapper;
public YxWechatReplyServiceImpl(YxWechatReplyRepository yxWechatReplyRepository, YxWechatReplyMapper yxWechatReplyMapper) {
this.yxWechatReplyRepository = yxWechatReplyRepository;
this.yxWechatReplyMapper = yxWechatReplyMapper;
}
@Override
public Map<String,Object> queryAll(YxWechatReplyQueryCriteria criteria, Pageable pageable){

11
yshop-mp/src/main/java/co/yixiang/mp/service/impl/YxWechatTemplateServiceImpl.java
View File

@ -27,11 +27,14 @@ import java.util.Map;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxWechatTemplateServiceImpl implements YxWechatTemplateService {
@Autowired
private YxWechatTemplateRepository yxWechatTemplateRepository;
private final YxWechatTemplateRepository yxWechatTemplateRepository;
@Autowired
private YxWechatTemplateMapper yxWechatTemplateMapper;
private final YxWechatTemplateMapper yxWechatTemplateMapper;
public YxWechatTemplateServiceImpl(YxWechatTemplateRepository yxWechatTemplateRepository, YxWechatTemplateMapper yxWechatTemplateMapper) {
this.yxWechatTemplateRepository = yxWechatTemplateRepository;
this.yxWechatTemplateMapper = yxWechatTemplateMapper;
}
@Override
public YxWechatTemplate findByTempkey(String key) {

14
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreBargainController.java → yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreBargainController.java
View File

@ -1,16 +1,13 @@
package co.yixiang.modules.activity.rest;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.aop.log.Log;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.activity.domain.YxStoreBargain;
import co.yixiang.modules.activity.service.YxStoreBargainService;
import co.yixiang.modules.activity.service.dto.YxStoreBargainQueryCriteria;
import co.yixiang.utils.OrderUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@ -22,13 +19,16 @@ import org.springframework.web.bind.annotation.*;
* @author xuwenbo
* @date 2019-12-22
*/
@Api(tags = "砍价管理")
@Api(tags = "商城:砍价管理")
@RestController
@RequestMapping("api")
public class YxStoreBargainController {
public class StoreBargainController {
@Autowired
private YxStoreBargainService yxStoreBargainService;
private final YxStoreBargainService yxStoreBargainService;
public StoreBargainController(YxStoreBargainService yxStoreBargainService) {
this.yxStoreBargainService = yxStoreBargainService;
}
@Log("查询砍价")
@ApiOperation(value = "查询砍价")

14
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCombinationController.java → yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCombinationController.java
View File

@ -1,9 +1,7 @@
package co.yixiang.modules.activity.rest;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.aop.log.Log;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.activity.domain.YxStoreCombination;
import co.yixiang.modules.activity.service.YxStoreCombinationService;
import co.yixiang.modules.activity.service.dto.YxStoreCombinationQueryCriteria;
@ -12,7 +10,6 @@ import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@ -24,13 +21,16 @@ import org.springframework.web.bind.annotation.*;
* @author hupeng
* @date 2019-11-18
*/
@Api(tags = "拼团管理")
@Api(tags = "商城:拼团管理")
@RestController
@RequestMapping("api")
public class YxStoreCombinationController {
public class StoreCombinationController {
@Autowired
private YxStoreCombinationService yxStoreCombinationService;
private final YxStoreCombinationService yxStoreCombinationService;
public StoreCombinationController(YxStoreCombinationService yxStoreCombinationService) {
this.yxStoreCombinationService = yxStoreCombinationService;
}
@Log("查询拼团")
@ApiOperation(value = "查询拼团")

14
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponController.java → yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponController.java
View File

@ -1,15 +1,12 @@
package co.yixiang.modules.activity.rest;
import cn.hutool.core.util.StrUtil;
import co.yixiang.aop.log.Log;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.activity.domain.YxStoreCoupon;
import co.yixiang.modules.activity.service.YxStoreCouponService;
import co.yixiang.modules.activity.service.dto.YxStoreCouponQueryCriteria;
import co.yixiang.utils.OrderUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@ -21,13 +18,16 @@ import org.springframework.web.bind.annotation.*;
* @author hupeng
* @date 2019-11-09
*/
@Api(tags = "优惠券管理")
@Api(tags = "商城:优惠券管理")
@RestController
@RequestMapping("api")
public class YxStoreCouponController {
public class StoreCouponController {
@Autowired
private YxStoreCouponService yxStoreCouponService;
private final YxStoreCouponService yxStoreCouponService;
public StoreCouponController(YxStoreCouponService yxStoreCouponService) {
this.yxStoreCouponService = yxStoreCouponService;
}
@Log("查询")
@ApiOperation(value = "查询")

13
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueController.java → yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueController.java
View File

@ -1,7 +1,6 @@
package co.yixiang.modules.activity.rest;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.aop.log.Log;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.activity.domain.YxStoreCouponIssue;
@ -10,7 +9,6 @@ import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueQueryCriteria;
import co.yixiang.utils.OrderUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@ -22,13 +20,16 @@ import org.springframework.web.bind.annotation.*;
* @author hupeng
* @date 2019-11-09
*/
@Api(tags = "发布管理")
@Api(tags = "商城:优惠券发布管理")
@RestController
@RequestMapping("api")
public class YxStoreCouponIssueController {
public class StoreCouponIssueController {
@Autowired
private YxStoreCouponIssueService yxStoreCouponIssueService;
private final YxStoreCouponIssueService yxStoreCouponIssueService;
public StoreCouponIssueController(YxStoreCouponIssueService yxStoreCouponIssueService) {
this.yxStoreCouponIssueService = yxStoreCouponIssueService;
}
@Log("查询已发布")
@ApiOperation(value = "查询已发布")

14
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponIssueUserController.java → yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponIssueUserController.java
View File

@ -1,14 +1,11 @@
package co.yixiang.modules.activity.rest;
import cn.hutool.core.util.StrUtil;
import co.yixiang.aop.log.Log;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.activity.domain.YxStoreCouponIssueUser;
import co.yixiang.modules.activity.service.YxStoreCouponIssueUserService;
import co.yixiang.modules.activity.service.dto.YxStoreCouponIssueUserQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@ -20,13 +17,16 @@ import org.springframework.web.bind.annotation.*;
* @author hupeng
* @date 2019-11-09
*/
@Api(tags = "优惠券前台用户领取记录管理")
@Api(tags = "商城:优惠券前台用户领取记录管理")
@RestController
@RequestMapping("api")
public class YxStoreCouponIssueUserController {
public class StoreCouponIssueUserController {
@Autowired
private YxStoreCouponIssueUserService yxStoreCouponIssueUserService;
private final YxStoreCouponIssueUserService yxStoreCouponIssueUserService;
public StoreCouponIssueUserController(YxStoreCouponIssueUserService yxStoreCouponIssueUserService) {
this.yxStoreCouponIssueUserService = yxStoreCouponIssueUserService;
}
@Log("查询")
@ApiOperation(value = "查询")

40
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreCouponUserController.java Normal file
View File

@ -0,0 +1,40 @@
package co.yixiang.modules.activity.rest;
import co.yixiang.aop.log.Log;
import co.yixiang.modules.activity.domain.YxStoreCouponUser;
import co.yixiang.modules.activity.service.YxStoreCouponUserService;
import co.yixiang.modules.activity.service.dto.YxStoreCouponUserQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.*;
/**
* @author hupeng
* @date 2019-11-10
*/
@Api(tags = "商城:优惠券发放记录管理")
@RestController
@RequestMapping("api")
public class StoreCouponUserController {
private final YxStoreCouponUserService yxStoreCouponUserService;
public StoreCouponUserController(YxStoreCouponUserService yxStoreCouponUserService) {
this.yxStoreCouponUserService = yxStoreCouponUserService;
}
@Log("查询Y")
@ApiOperation(value = "查询")
@GetMapping(value = "/yxStoreCouponUser")
@PreAuthorize("@el.check('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_SELECT')")
public ResponseEntity getYxStoreCouponUsers(YxStoreCouponUserQueryCriteria criteria, Pageable pageable){
return new ResponseEntity(yxStoreCouponUserService.queryAll(criteria,pageable),HttpStatus.OK);
}
}

40
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StorePinkController.java Normal file
View File

@ -0,0 +1,40 @@
package co.yixiang.modules.activity.rest;
import co.yixiang.aop.log.Log;
import co.yixiang.modules.activity.domain.YxStorePink;
import co.yixiang.modules.activity.service.YxStorePinkService;
import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
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.*;
/**
* @author hupeng
* @date 2019-11-18
*/
@Api(tags = "商城:拼团记录管理")
@RestController
@RequestMapping("api")
public class StorePinkController {
private final YxStorePinkService yxStorePinkService;
public StorePinkController(YxStorePinkService yxStorePinkService) {
this.yxStorePinkService = yxStorePinkService;
}
@Log("查询记录")
@ApiOperation(value = "查询记录")
@GetMapping(value = "/yxStorePink")
@PreAuthorize("@el.check('admin','YXSTOREPINK_ALL','YXSTOREPINK_SELECT')")
public ResponseEntity getYxStorePinks(YxStorePinkQueryCriteria criteria, Pageable pageable){
return new ResponseEntity(yxStorePinkService.queryAll(criteria,pageable),HttpStatus.OK);
}
}

26
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreSeckillController.java → yshop-shop/src/main/java/co/yixiang/modules/activity/rest/StoreSeckillController.java
View File

@ -1,16 +1,13 @@
package co.yixiang.modules.activity.rest;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import co.yixiang.aop.log.Log;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.activity.domain.YxStoreSeckill;
import co.yixiang.modules.activity.service.YxStoreSeckillService;
import co.yixiang.modules.activity.service.dto.YxStoreSeckillQueryCriteria;
import co.yixiang.utils.OrderUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@ -22,16 +19,19 @@ import org.springframework.web.bind.annotation.*;
* @author xuwenbo
* @date 2019-12-14
*/
@Api(tags = "秒杀管理")
@Api(tags = "商城:秒杀管理")
@RestController
@RequestMapping("api")
public class YxStoreSeckillController {
public class StoreSeckillController {
@Autowired
private YxStoreSeckillService yxStoreSeckillService;
private final YxStoreSeckillService yxStoreSeckillService;
@Log("查询YxStoreSeckill")
@ApiOperation(value = "查询YxStoreSeckill")
public StoreSeckillController(YxStoreSeckillService yxStoreSeckillService) {
this.yxStoreSeckillService = yxStoreSeckillService;
}
@Log("列表")
@ApiOperation(value = "列表")
@GetMapping(value = "/yxStoreSeckill")
@PreAuthorize("@el.check('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_SELECT')")
public ResponseEntity getYxStoreSeckills(YxStoreSeckillQueryCriteria criteria, Pageable pageable){
@ -40,8 +40,8 @@ public class YxStoreSeckillController {
@Log("修改YxStoreSeckill")
@ApiOperation(value = "修改YxStoreSeckill")
@Log("发布")
@ApiOperation(value = "发布")
@PutMapping(value = "/yxStoreSeckill")
@PreAuthorize("@el.check('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_EDIT')")
public ResponseEntity update(@Validated @RequestBody YxStoreSeckill resources){
@ -62,8 +62,8 @@ public class YxStoreSeckillController {
}
}
@Log("删除YxStoreSeckill")
@ApiOperation(value = "删除YxStoreSeckill")
@Log("删除")
@ApiOperation(value = "删除")
@DeleteMapping(value = "/yxStoreSeckill/{id}")
@PreAuthorize("@el.check('admin','YXSTORESECKILL_ALL','YXSTORESECKILL_DELETE')")
public ResponseEntity delete(@PathVariable Integer id){

34
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxUserExtractController.java → yshop-shop/src/main/java/co/yixiang/modules/activity/rest/UserExtractController.java
View File

@ -11,8 +11,8 @@ import co.yixiang.modules.activity.service.dto.YxUserExtractQueryCriteria;
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.dto.YxUserDTO;
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.utils.OrderUtil;
import co.yixiang.utils.RedisUtil;
@ -21,7 +21,6 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Pageable;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@ -35,25 +34,26 @@ import java.math.BigDecimal;
* @author hupeng
* @date 2019-11-14
*/
@Api(tags = "提现管理")
@Api(tags = "商城:提现管理")
@RestController
@RequestMapping("api")
public class YxUserExtractController {
public class UserExtractController {
@Autowired
private YxUserExtractService yxUserExtractService;
private final YxUserExtractService yxUserExtractService;
private final YxUserService yxUserService;
private final YxUserBillService yxUserBillService;
private final WxPayService wxPayService;
private final YxWechatUserService wechatUserService;
@Autowired
private YxUserService yxUserService;
@Autowired
private YxUserBillService yxUserBillService;
@Autowired
private WxPayService wxPayService;
@Autowired
private YxWechatUserService wechatUserService;
public UserExtractController(YxUserExtractService yxUserExtractService, YxUserService yxUserService,
YxUserBillService yxUserBillService, WxPayService wxPayService,
YxWechatUserService wechatUserService) {
this.yxUserExtractService = yxUserExtractService;
this.yxUserService = yxUserService;
this.yxUserBillService = yxUserBillService;
this.wxPayService = wxPayService;
this.wechatUserService = wechatUserService;
}
@Log("查询")
@ApiOperation(value = "查询")

65
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStoreCouponUserController.java
View File

@ -1,65 +0,0 @@
package co.yixiang.modules.activity.rest;
import cn.hutool.core.util.StrUtil;
import co.yixiang.aop.log.Log;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.activity.domain.YxStoreCouponUser;
import co.yixiang.modules.activity.service.YxStoreCouponUserService;
import co.yixiang.modules.activity.service.dto.YxStoreCouponUserQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
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.*;
/**
* @author hupeng
* @date 2019-11-10
*/
@Api(tags = "优惠券发放记录管理")
@RestController
@RequestMapping("api")
public class YxStoreCouponUserController {
@Autowired
private YxStoreCouponUserService yxStoreCouponUserService;
@Log("查询Y")
@ApiOperation(value = "查询")
@GetMapping(value = "/yxStoreCouponUser")
@PreAuthorize("@el.check('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_SELECT')")
public ResponseEntity getYxStoreCouponUsers(YxStoreCouponUserQueryCriteria criteria, Pageable pageable){
return new ResponseEntity(yxStoreCouponUserService.queryAll(criteria,pageable),HttpStatus.OK);
}
@Log("新增YxStoreCouponUser")
@ApiOperation(value = "新增YxStoreCouponUser")
@PostMapping(value = "/yxStoreCouponUser")
@PreAuthorize("@el.check('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_CREATE')")
public ResponseEntity create(@Validated @RequestBody YxStoreCouponUser resources){
return new ResponseEntity(yxStoreCouponUserService.create(resources),HttpStatus.CREATED);
}
@Log("修改YxStoreCouponUser")
@ApiOperation(value = "修改YxStoreCouponUser")
@PutMapping(value = "/yxStoreCouponUser")
@PreAuthorize("@el.check('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_EDIT')")
public ResponseEntity update(@Validated @RequestBody YxStoreCouponUser resources){
yxStoreCouponUserService.update(resources);
return new ResponseEntity(HttpStatus.NO_CONTENT);
}
@Log("删除YxStoreCouponUser")
@ApiOperation(value = "删除YxStoreCouponUser")
@DeleteMapping(value = "/yxStoreCouponUser/{id}")
@PreAuthorize("@el.check('admin','YXSTORECOUPONUSER_ALL','YXSTORECOUPONUSER_DELETE')")
public ResponseEntity delete(@PathVariable Integer id){
//if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作");
yxStoreCouponUserService.delete(id);
return new ResponseEntity(HttpStatus.OK);
}
}

65
yshop-shop/src/main/java/co/yixiang/modules/activity/rest/YxStorePinkController.java
View File

@ -1,65 +0,0 @@
package co.yixiang.modules.activity.rest;
import cn.hutool.core.util.StrUtil;
import co.yixiang.aop.log.Log;
import co.yixiang.exception.BadRequestException;
import co.yixiang.modules.activity.domain.YxStorePink;
import co.yixiang.modules.activity.service.YxStorePinkService;
import co.yixiang.modules.activity.service.dto.YxStorePinkQueryCriteria;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.beans.factory.annotation.Autowired;
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.*;
/**
* @author hupeng
* @date 2019-11-18
*/
@Api(tags = "拼团记录管理")
@RestController
@RequestMapping("api")
public class YxStorePinkController {
@Autowired
private YxStorePinkService yxStorePinkService;
@Log("查询记录")
@ApiOperation(value = "查询记录")
@GetMapping(value = "/yxStorePink")
@PreAuthorize("@el.check('admin','YXSTOREPINK_ALL','YXSTOREPINK_SELECT')")
public ResponseEntity getYxStorePinks(YxStorePinkQueryCriteria criteria, Pageable pageable){
return new ResponseEntity(yxStorePinkService.queryAll(criteria,pageable),HttpStatus.OK);
}
@Log("新增YxStorePink")
@ApiOperation(value = "新增YxStorePink")
@PostMapping(value = "/yxStorePink")
@PreAuthorize("@el.check('admin','YXSTOREPINK_ALL','YXSTOREPINK_CREATE')")
public ResponseEntity create(@Validated @RequestBody YxStorePink resources){
return new ResponseEntity(yxStorePinkService.create(resources),HttpStatus.CREATED);
}
@Log("修改YxStorePink")
@ApiOperation(value = "修改YxStorePink")
@PutMapping(value = "/yxStorePink")
@PreAuthorize("@el.check('admin','YXSTOREPINK_ALL','YXSTOREPINK_EDIT')")
public ResponseEntity update(@Validated @RequestBody YxStorePink resources){
yxStorePinkService.update(resources);
return new ResponseEntity(HttpStatus.NO_CONTENT);
}
@Log("删除YxStorePink")
@ApiOperation(value = "删除YxStorePink")
@DeleteMapping(value = "/yxStorePink/{id}")
@PreAuthorize("@el.check('admin','YXSTOREPINK_ALL','YXSTOREPINK_DELETE')")
public ResponseEntity delete(@PathVariable Integer id){
//if(StrUtil.isNotEmpty("22")) throw new BadRequestException("演示环境禁止操作");
yxStorePinkService.delete(id);
return new ResponseEntity(HttpStatus.OK);
}
}

5
yshop-shop/src/main/java/co/yixiang/modules/activity/service/dto/YxStoreCouponIssueDTO.java
View File

@ -3,6 +3,7 @@ package co.yixiang.modules.activity.service.dto;
import lombok.Data;
import java.io.Serializable;
import java.util.Date;
/**
@ -25,6 +26,10 @@ public class YxStoreCouponIssueDTO implements Serializable {
// 优惠券领取结束时间
private Integer endTime;
private Date startTimeDate;
private Date endTimeDate;
// 优惠券领取数量
private Integer totalCount;

12
yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreBargainServiceImpl.java
View File

@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreBargainMapper;
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;
@ -28,11 +27,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreBargainServiceImpl implements YxStoreBargainService {
@Autowired
private YxStoreBargainRepository yxStoreBargainRepository;
private final YxStoreBargainRepository yxStoreBargainRepository;
@Autowired
private YxStoreBargainMapper yxStoreBargainMapper;
private final YxStoreBargainMapper yxStoreBargainMapper;
public YxStoreBargainServiceImpl(YxStoreBargainRepository yxStoreBargainRepository, YxStoreBargainMapper yxStoreBargainMapper) {
this.yxStoreBargainRepository = yxStoreBargainRepository;
this.yxStoreBargainMapper = yxStoreBargainMapper;
}
@Override
public Map<String,Object> queryAll(YxStoreBargainQueryCriteria criteria, Pageable pageable){

21
yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCombinationServiceImpl.java
View File

@ -10,7 +10,6 @@ import co.yixiang.modules.activity.service.dto.YxStoreCombinationQueryCriteria;
import co.yixiang.modules.activity.service.mapper.YxStoreCombinationMapper;
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;
@ -30,17 +29,19 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreCombinationServiceImpl implements YxStoreCombinationService {
@Autowired
private YxStoreCombinationRepository yxStoreCombinationRepository;
private final YxStoreCombinationRepository yxStoreCombinationRepository;
private final YxStorePinkRepository storePinkRepository;
private final YxStoreVisitRepository storeVisitRepository;
@Autowired
private YxStorePinkRepository storePinkRepository;
private final YxStoreCombinationMapper yxStoreCombinationMapper;
@Autowired
private YxStoreVisitRepository storeVisitRepository;
@Autowired
private YxStoreCombinationMapper yxStoreCombinationMapper;
public YxStoreCombinationServiceImpl(YxStoreCombinationRepository yxStoreCombinationRepository, YxStorePinkRepository storePinkRepository,
YxStoreVisitRepository storeVisitRepository, YxStoreCombinationMapper yxStoreCombinationMapper) {
this.yxStoreCombinationRepository = yxStoreCombinationRepository;
this.storePinkRepository = storePinkRepository;
this.storeVisitRepository = storeVisitRepository;
this.yxStoreCombinationMapper = yxStoreCombinationMapper;
}
@Override
public Map<String,Object> queryAll(YxStoreCombinationQueryCriteria criteria, Pageable pageable){

12
yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueServiceImpl.java
View File

@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreCouponIssueMapper;
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;
@ -28,11 +27,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreCouponIssueServiceImpl implements YxStoreCouponIssueService {
@Autowired
private YxStoreCouponIssueRepository yxStoreCouponIssueRepository;
private final YxStoreCouponIssueRepository yxStoreCouponIssueRepository;
@Autowired
private YxStoreCouponIssueMapper yxStoreCouponIssueMapper;
private final YxStoreCouponIssueMapper yxStoreCouponIssueMapper;
public YxStoreCouponIssueServiceImpl(YxStoreCouponIssueRepository yxStoreCouponIssueRepository, YxStoreCouponIssueMapper yxStoreCouponIssueMapper) {
this.yxStoreCouponIssueRepository = yxStoreCouponIssueRepository;
this.yxStoreCouponIssueMapper = yxStoreCouponIssueMapper;
}
@Override
public Map<String,Object> queryAll(YxStoreCouponIssueQueryCriteria criteria, Pageable pageable){

12
yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponIssueUserServiceImpl.java
View File

@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreCouponIssueUserMapper;
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;
@ -28,11 +27,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreCouponIssueUserServiceImpl implements YxStoreCouponIssueUserService {
@Autowired
private YxStoreCouponIssueUserRepository yxStoreCouponIssueUserRepository;
private final YxStoreCouponIssueUserRepository yxStoreCouponIssueUserRepository;
@Autowired
private YxStoreCouponIssueUserMapper yxStoreCouponIssueUserMapper;
private final YxStoreCouponIssueUserMapper yxStoreCouponIssueUserMapper;
public YxStoreCouponIssueUserServiceImpl(YxStoreCouponIssueUserRepository yxStoreCouponIssueUserRepository, YxStoreCouponIssueUserMapper yxStoreCouponIssueUserMapper) {
this.yxStoreCouponIssueUserRepository = yxStoreCouponIssueUserRepository;
this.yxStoreCouponIssueUserMapper = yxStoreCouponIssueUserMapper;
}
@Override
public Map<String,Object> queryAll(YxStoreCouponIssueUserQueryCriteria criteria, Pageable pageable){

12
yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponServiceImpl.java
View File

@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreCouponMapper;
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;
@ -28,11 +27,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreCouponServiceImpl implements YxStoreCouponService {
@Autowired
private YxStoreCouponRepository yxStoreCouponRepository;
private final YxStoreCouponRepository yxStoreCouponRepository;
@Autowired
private YxStoreCouponMapper yxStoreCouponMapper;
private final YxStoreCouponMapper yxStoreCouponMapper;
public YxStoreCouponServiceImpl(YxStoreCouponRepository yxStoreCouponRepository, YxStoreCouponMapper yxStoreCouponMapper) {
this.yxStoreCouponRepository = yxStoreCouponRepository;
this.yxStoreCouponMapper = yxStoreCouponMapper;
}
@Override
public Map<String,Object> queryAll(YxStoreCouponQueryCriteria criteria, Pageable pageable){

16
yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreCouponUserServiceImpl.java
View File

@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreCouponUserMapper;
import co.yixiang.modules.shop.service.YxUserService;
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;
@ -29,14 +28,17 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreCouponUserServiceImpl implements YxStoreCouponUserService {
@Autowired
private YxStoreCouponUserRepository yxStoreCouponUserRepository;
private final YxStoreCouponUserRepository yxStoreCouponUserRepository;
@Autowired
private YxStoreCouponUserMapper yxStoreCouponUserMapper;
private final YxStoreCouponUserMapper yxStoreCouponUserMapper;
@Autowired
private YxUserService userService;
private final YxUserService userService;
public YxStoreCouponUserServiceImpl(YxStoreCouponUserRepository yxStoreCouponUserRepository, YxStoreCouponUserMapper yxStoreCouponUserMapper, YxUserService userService) {
this.yxStoreCouponUserRepository = yxStoreCouponUserRepository;
this.yxStoreCouponUserMapper = yxStoreCouponUserMapper;
this.userService = userService;
}
@Override
public Map<String,Object> queryAll(YxStoreCouponUserQueryCriteria criteria, Pageable pageable){

20
yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStorePinkServiceImpl.java
View File

@ -12,7 +12,6 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@ -32,17 +31,20 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStorePinkServiceImpl implements YxStorePinkService {
@Autowired
private YxStorePinkRepository yxStorePinkRepository;
private final YxStorePinkRepository yxStorePinkRepository;
@Autowired
private YxStoreCombinationService combinationService;
private final YxStoreCombinationService combinationService;
private final YxUserService userService;
@Autowired
private YxUserService userService;
private final YxStorePinkMapper yxStorePinkMapper;
@Autowired
private YxStorePinkMapper yxStorePinkMapper;
public YxStorePinkServiceImpl(YxStorePinkRepository yxStorePinkRepository, YxStoreCombinationService combinationService,
YxUserService userService, YxStorePinkMapper yxStorePinkMapper) {
this.yxStorePinkRepository = yxStorePinkRepository;
this.combinationService = combinationService;
this.userService = userService;
this.yxStorePinkMapper = yxStorePinkMapper;
}
/**
* 参与拼团的人

12
yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreSeckillServiceImpl.java
View File

@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreSeckillMapper;
import co.yixiang.utils.OrderUtil;
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;
@ -29,11 +28,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreSeckillServiceImpl implements YxStoreSeckillService {
@Autowired
private YxStoreSeckillRepository yxStoreSeckillRepository;
private final YxStoreSeckillRepository yxStoreSeckillRepository;
@Autowired
private YxStoreSeckillMapper yxStoreSeckillMapper;
private final YxStoreSeckillMapper yxStoreSeckillMapper;
public YxStoreSeckillServiceImpl(YxStoreSeckillRepository yxStoreSeckillRepository, YxStoreSeckillMapper yxStoreSeckillMapper) {
this.yxStoreSeckillRepository = yxStoreSeckillRepository;
this.yxStoreSeckillMapper = yxStoreSeckillMapper;
}
@Override
public Map<String,Object> queryAll(YxStoreSeckillQueryCriteria criteria, Pageable pageable){

12
yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxStoreVisitServiceImpl.java
View File

@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxStoreVisitMapper;
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;
@ -28,11 +27,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreVisitServiceImpl implements YxStoreVisitService {
@Autowired
private YxStoreVisitRepository yxStoreVisitRepository;
private final YxStoreVisitRepository yxStoreVisitRepository;
@Autowired
private YxStoreVisitMapper yxStoreVisitMapper;
private final YxStoreVisitMapper yxStoreVisitMapper;
public YxStoreVisitServiceImpl(YxStoreVisitRepository yxStoreVisitRepository, YxStoreVisitMapper yxStoreVisitMapper) {
this.yxStoreVisitRepository = yxStoreVisitRepository;
this.yxStoreVisitMapper = yxStoreVisitMapper;
}
@Override
public Map<String,Object> queryAll(YxStoreVisitQueryCriteria criteria, Pageable pageable){

12
yshop-shop/src/main/java/co/yixiang/modules/activity/service/impl/YxUserExtractServiceImpl.java
View File

@ -9,7 +9,6 @@ import co.yixiang.modules.activity.service.mapper.YxUserExtractMapper;
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;
@ -28,11 +27,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxUserExtractServiceImpl implements YxUserExtractService {
@Autowired
private YxUserExtractRepository yxUserExtractRepository;
private final YxUserExtractRepository yxUserExtractRepository;
@Autowired
private YxUserExtractMapper yxUserExtractMapper;
private final YxUserExtractMapper yxUserExtractMapper;
public YxUserExtractServiceImpl(YxUserExtractRepository yxUserExtractRepository, YxUserExtractMapper yxUserExtractMapper) {
this.yxUserExtractRepository = yxUserExtractRepository;
this.yxUserExtractMapper = yxUserExtractMapper;
}
@Override
public Map<String,Object> queryAll(YxUserExtractQueryCriteria criteria, Pageable pageable){

1
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxExpressServiceImpl.java
View File

@ -10,7 +10,6 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;

5
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialGroupServiceImpl.java
View File

@ -22,10 +22,7 @@ import org.springframework.data.domain.Page;
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

4
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxMaterialServiceImpl.java
View File

@ -22,10 +22,6 @@ import org.springframework.data.domain.Page;
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

12
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreCategoryServiceImpl.java
View File

@ -11,7 +11,6 @@ import co.yixiang.utils.FileUtil;
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;
@ -32,12 +31,15 @@ import java.util.stream.Collectors;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreCategoryServiceImpl implements YxStoreCategoryService {
@Autowired
private YxStoreCategoryRepository yxStoreCategoryRepository;
@Autowired
private YxStoreCategoryMapper yxStoreCategoryMapper;
private final YxStoreCategoryRepository yxStoreCategoryRepository;
private final YxStoreCategoryMapper yxStoreCategoryMapper;
public YxStoreCategoryServiceImpl(YxStoreCategoryRepository yxStoreCategoryRepository, YxStoreCategoryMapper yxStoreCategoryMapper) {
this.yxStoreCategoryRepository = yxStoreCategoryRepository;
this.yxStoreCategoryMapper = yxStoreCategoryMapper;
}
@Override
public void download(List<YxStoreCategoryDTO> queryAll, HttpServletResponse response) throws IOException {

46
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderServiceImpl.java
View File

@ -31,7 +31,6 @@ import com.github.binarywang.wxpay.config.WxPayConfig;
import com.github.binarywang.wxpay.exception.WxPayException;
import com.github.binarywang.wxpay.service.WxPayService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@ -50,32 +49,31 @@ import java.util.*;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreOrderServiceImpl implements YxStoreOrderService {
@Autowired
private YxStoreOrderRepository yxStoreOrderRepository;
private final YxStoreOrderRepository yxStoreOrderRepository;
private final YxStoreOrderCartInfoRepository yxStoreOrderCartInfoRepository;
private final YxUserRepository userRepository;
private final YxStorePinkRepository storePinkRepository;
@Autowired
private YxStoreOrderCartInfoRepository yxStoreOrderCartInfoRepository;
private final YxStoreOrderMapper yxStoreOrderMapper;
@Autowired
private YxStoreOrderMapper yxStoreOrderMapper;
private final YxUserBillService yxUserBillService;
private final YxStoreOrderStatusService yxStoreOrderStatusService;
private final YxUserService userService;
private final WxPayService wxPayService;
@Autowired
private YxStoreOrderStatusService yxStoreOrderStatusService;
@Autowired
private YxUserService userService;
@Autowired
private YxUserRepository userRepository;
@Autowired
private YxUserBillService yxUserBillService;
@Autowired
private YxStorePinkRepository storePinkRepository;
@Autowired
private WxPayService wxPayService;
public YxStoreOrderServiceImpl(YxStoreOrderRepository yxStoreOrderRepository, YxStoreOrderCartInfoRepository yxStoreOrderCartInfoRepository, YxUserRepository userRepository,
YxStorePinkRepository storePinkRepository, YxStoreOrderMapper yxStoreOrderMapper, YxUserBillService yxUserBillService,
YxStoreOrderStatusService yxStoreOrderStatusService, YxUserService userService, WxPayService wxPayService) {
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.wxPayService = wxPayService;
}
@Override
public OrderTimeDataDTO getOrderTimeData() {

12
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreOrderStatusServiceImpl.java
View File

@ -9,7 +9,6 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@ -28,11 +27,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreOrderStatusServiceImpl implements YxStoreOrderStatusService {
@Autowired
private YxStoreOrderStatusRepository yxStoreOrderStatusRepository;
private final YxStoreOrderStatusRepository yxStoreOrderStatusRepository;
@Autowired
private YxStoreOrderStatusMapper yxStoreOrderStatusMapper;
private final YxStoreOrderStatusMapper yxStoreOrderStatusMapper;
public YxStoreOrderStatusServiceImpl(YxStoreOrderStatusRepository yxStoreOrderStatusRepository, YxStoreOrderStatusMapper yxStoreOrderStatusMapper) {
this.yxStoreOrderStatusRepository = yxStoreOrderStatusRepository;
this.yxStoreOrderStatusMapper = yxStoreOrderStatusMapper;
}
@Override
public Map<String,Object> queryAll(YxStoreOrderStatusQueryCriteria criteria, Pageable pageable){

20
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductReplyServiceImpl.java
View File

@ -10,7 +10,6 @@ import co.yixiang.modules.shop.service.dto.YxStoreProductReplyQueryCriteria;
import co.yixiang.modules.shop.service.mapper.YxStoreProductReplyMapper;
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;
@ -27,17 +26,20 @@ import java.util.*;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreProductReplyServiceImpl implements YxStoreProductReplyService {
@Autowired
private YxStoreProductReplyRepository yxStoreProductReplyRepository;
private final YxStoreProductReplyRepository yxStoreProductReplyRepository;
@Autowired
private YxStoreProductReplyMapper yxStoreProductReplyMapper;
private final YxStoreProductReplyMapper yxStoreProductReplyMapper;
@Autowired
private YxUserService userService;
private final YxUserService userService;
private final YxStoreProductService productService;
@Autowired
private YxStoreProductService productService;
public YxStoreProductReplyServiceImpl(YxStoreProductReplyRepository yxStoreProductReplyRepository, YxStoreProductReplyMapper yxStoreProductReplyMapper,
YxUserService userService, YxStoreProductService productService) {
this.yxStoreProductReplyRepository = yxStoreProductReplyRepository;
this.yxStoreProductReplyMapper = yxStoreProductReplyMapper;
this.userService = userService;
this.productService = productService;
}
@Override
public Map<String,Object> queryAll(YxStoreProductReplyQueryCriteria criteria, Pageable pageable){

32
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxStoreProductServiceImpl.java
View File

@ -17,7 +17,6 @@ import co.yixiang.utils.QueryHelp;
import co.yixiang.utils.ValidationUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@ -36,23 +35,24 @@ import java.util.stream.Collectors;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxStoreProductServiceImpl implements YxStoreProductService {
@Autowired
private YxStoreProductRepository yxStoreProductRepository;
private final YxStoreProductRepository yxStoreProductRepository;
private final YxStoreCategoryRepository yxStoreCategoryRepository;
private final YxStoreProductAttrRepository yxStoreProductAttrRepository;
private final YxStoreProductAttrValueRepository yxStoreProductAttrValueRepository;
private final YxStoreProductAttrResultRepository yxStoreProductAttrResultRepository;
@Autowired
private YxStoreCategoryRepository yxStoreCategoryRepository;
private final YxStoreProductMapper yxStoreProductMapper;
@Autowired
private YxStoreProductAttrRepository yxStoreProductAttrRepository;
@Autowired
private YxStoreProductAttrValueRepository yxStoreProductAttrValueRepository;
@Autowired
private YxStoreProductAttrResultRepository yxStoreProductAttrResultRepository;
@Autowired
private YxStoreProductMapper yxStoreProductMapper;
public YxStoreProductServiceImpl(YxStoreProductRepository yxStoreProductRepository, YxStoreCategoryRepository yxStoreCategoryRepository,
YxStoreProductAttrRepository yxStoreProductAttrRepository, YxStoreProductAttrValueRepository yxStoreProductAttrValueRepository,
YxStoreProductAttrResultRepository yxStoreProductAttrResultRepository, YxStoreProductMapper yxStoreProductMapper) {
this.yxStoreProductRepository = yxStoreProductRepository;
this.yxStoreCategoryRepository = yxStoreCategoryRepository;
this.yxStoreProductAttrRepository = yxStoreProductAttrRepository;
this.yxStoreProductAttrValueRepository = yxStoreProductAttrValueRepository;
this.yxStoreProductAttrResultRepository = yxStoreProductAttrResultRepository;
this.yxStoreProductMapper = yxStoreProductMapper;
}
@Override
public Map<String,Object> queryAll(YxStoreProductQueryCriteria criteria, Pageable pageable){

12
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemConfigServiceImpl.java
View File

@ -9,7 +9,6 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@ -28,11 +27,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxSystemConfigServiceImpl implements YxSystemConfigService {
@Autowired
private YxSystemConfigRepository yxSystemConfigRepository;
private final YxSystemConfigRepository yxSystemConfigRepository;
@Autowired
private YxSystemConfigMapper yxSystemConfigMapper;
private final YxSystemConfigMapper yxSystemConfigMapper;
public YxSystemConfigServiceImpl(YxSystemConfigRepository yxSystemConfigRepository, YxSystemConfigMapper yxSystemConfigMapper) {
this.yxSystemConfigRepository = yxSystemConfigRepository;
this.yxSystemConfigMapper = yxSystemConfigMapper;
}
@Override
public Map<String,Object> queryAll(YxSystemConfigQueryCriteria criteria, Pageable pageable){

12
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemGroupDataServiceImpl.java
View File

@ -9,7 +9,6 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@ -26,11 +25,14 @@ import java.util.*;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxSystemGroupDataServiceImpl implements YxSystemGroupDataService {
@Autowired
private YxSystemGroupDataRepository yxSystemGroupDataRepository;
private final YxSystemGroupDataRepository yxSystemGroupDataRepository;
@Autowired
private YxSystemGroupDataMapper yxSystemGroupDataMapper;
private final YxSystemGroupDataMapper yxSystemGroupDataMapper;
public YxSystemGroupDataServiceImpl(YxSystemGroupDataRepository yxSystemGroupDataRepository, YxSystemGroupDataMapper yxSystemGroupDataMapper) {
this.yxSystemGroupDataRepository = yxSystemGroupDataRepository;
this.yxSystemGroupDataMapper = yxSystemGroupDataMapper;
}
@Override
public Map<String,Object> queryAll(YxSystemGroupDataQueryCriteria criteria, Pageable pageable){

11
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserLevelServiceImpl.java
View File

@ -28,11 +28,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxSystemUserLevelServiceImpl implements YxSystemUserLevelService {
@Autowired
private YxSystemUserLevelRepository yxSystemUserLevelRepository;
private final YxSystemUserLevelRepository yxSystemUserLevelRepository;
@Autowired
private YxSystemUserLevelMapper yxSystemUserLevelMapper;
private final YxSystemUserLevelMapper yxSystemUserLevelMapper;
public YxSystemUserLevelServiceImpl(YxSystemUserLevelRepository yxSystemUserLevelRepository, YxSystemUserLevelMapper yxSystemUserLevelMapper) {
this.yxSystemUserLevelRepository = yxSystemUserLevelRepository;
this.yxSystemUserLevelMapper = yxSystemUserLevelMapper;
}
@Override
public Map<String,Object> queryAll(YxSystemUserLevelQueryCriteria criteria, Pageable pageable){

16
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxSystemUserTaskServiceImpl.java
View File

@ -9,7 +9,6 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@ -29,14 +28,17 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxSystemUserTaskServiceImpl implements YxSystemUserTaskService {
@Autowired
private YxSystemUserTaskRepository yxSystemUserTaskRepository;
private final YxSystemUserTaskRepository yxSystemUserTaskRepository;
@Autowired
private YxSystemUserTaskMapper yxSystemUserTaskMapper;
private final YxSystemUserTaskMapper yxSystemUserTaskMapper;
@Autowired
private YxSystemUserLevelService systemUserLevelService;
private final YxSystemUserLevelService systemUserLevelService;
public YxSystemUserTaskServiceImpl(YxSystemUserTaskRepository yxSystemUserTaskRepository, YxSystemUserTaskMapper yxSystemUserTaskMapper, YxSystemUserLevelService systemUserLevelService) {
this.yxSystemUserTaskRepository = yxSystemUserTaskRepository;
this.yxSystemUserTaskMapper = yxSystemUserTaskMapper;
this.systemUserLevelService = systemUserLevelService;
}
@Override
public Map<String,Object> queryAll(YxSystemUserTaskQueryCriteria criteria, Pageable pageable){

12
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserBillServiceImpl.java
View File

@ -8,7 +8,6 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@ -28,11 +27,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxUserBillServiceImpl implements YxUserBillService {
@Autowired
private YxUserBillRepository yxUserBillRepository;
private final YxUserBillRepository yxUserBillRepository;
@Autowired
private YxUserBillMapper yxUserBillMapper;
private final YxUserBillMapper yxUserBillMapper;
public YxUserBillServiceImpl(YxUserBillRepository yxUserBillRepository, YxUserBillMapper yxUserBillMapper) {
this.yxUserBillRepository = yxUserBillRepository;
this.yxUserBillMapper = yxUserBillMapper;
}
@Override
public Map<String,Object> queryAll(YxUserBillQueryCriteria criteria, Pageable pageable){

16
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxUserServiceImpl.java
View File

@ -14,7 +14,6 @@ import co.yixiang.utils.OrderUtil;
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;
@ -34,14 +33,17 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxUserServiceImpl implements YxUserService {
@Autowired
private YxUserRepository yxUserRepository;
private final YxUserRepository yxUserRepository;
@Autowired
private YxUserMapper yxUserMapper;
private final YxUserMapper yxUserMapper;
@Autowired
private YxUserBillService yxUserBillService;
private final YxUserBillService yxUserBillService;
public YxUserServiceImpl(YxUserRepository yxUserRepository, YxUserMapper yxUserMapper, YxUserBillService yxUserBillService) {
this.yxUserRepository = yxUserRepository;
this.yxUserMapper = yxUserMapper;
this.yxUserBillService = yxUserBillService;
}
@Override
@Transactional(rollbackFor = Exception.class)

12
yshop-shop/src/main/java/co/yixiang/modules/shop/service/impl/YxWechatUserServiceImpl.java
View File

@ -9,7 +9,6 @@ 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.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@ -28,11 +27,14 @@ import java.util.Optional;
@Transactional(propagation = Propagation.SUPPORTS, readOnly = true, rollbackFor = Exception.class)
public class YxWechatUserServiceImpl implements YxWechatUserService {
@Autowired
private YxWechatUserRepository yxWechatUserRepository;
private final YxWechatUserRepository yxWechatUserRepository;
@Autowired
private YxWechatUserMapper yxWechatUserMapper;
private final YxWechatUserMapper yxWechatUserMapper;
public YxWechatUserServiceImpl(YxWechatUserRepository yxWechatUserRepository, YxWechatUserMapper yxWechatUserMapper) {
this.yxWechatUserRepository = yxWechatUserRepository;
this.yxWechatUserMapper = yxWechatUserMapper;
}
@Override
public Map<String,Object> queryAll(YxWechatUserQueryCriteria criteria, Pageable pageable){