From 213f6b217ba9eb8f5562adb7e90407a7797a581a Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期五, 24 三月 2023 10:35:37 +0800 Subject: [PATCH] 发票管理修改 --- management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java | 108 +++++++++++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 99 insertions(+), 9 deletions(-) diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java index b7814cb..1fd7164 100644 --- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java +++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCouponController.java @@ -2,9 +2,16 @@ import com.baomidou.mybatisplus.mapper.EntityWrapper; import com.stylefeng.guns.core.base.controller.BaseController; +import com.stylefeng.guns.core.base.tips.SuccessTip; +import com.stylefeng.guns.core.util.DateUtil; import com.stylefeng.guns.modular.system.controller.req.CouponSendReq; import com.stylefeng.guns.modular.system.enums.CouponStatusEnum; +import com.stylefeng.guns.modular.system.enums.StatusEnum; +import com.stylefeng.guns.modular.system.model.TAgent; +import com.stylefeng.guns.modular.system.model.TUserToCoupon; +import com.stylefeng.guns.modular.system.service.ITUserToCouponService; import io.swagger.annotations.ApiOperation; +import org.apache.poi.hdf.extractor.TC; import org.springframework.stereotype.Controller; import org.springframework.util.Assert; import org.springframework.util.CollectionUtils; @@ -19,9 +26,9 @@ import com.stylefeng.guns.modular.system.model.TCoupon; import com.stylefeng.guns.modular.system.service.ITCouponService; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; +import java.time.LocalDate; +import java.time.ZoneId; +import java.util.*; /** * 控制器 @@ -37,6 +44,8 @@ @Autowired private ITCouponService tCouponService; + @Autowired + private ITUserToCouponService tUserToCouponService; /** * 跳转到首页 @@ -70,12 +79,39 @@ */ @RequestMapping(value = "/list") @ResponseBody - public Object list(String condition) { + public Object list(Integer couponType,Integer couponServiceType,String createTime) { EntityWrapper<TCoupon> wrapper = new EntityWrapper<>(); - if(StringUtils.hasLength(condition)){ - wrapper.like("coupon_name",condition); + if(Objects.nonNull(couponType)){ + wrapper.eq("coupon_type",couponType); } - wrapper.groupBy(true,"coupon_name"); + if(Objects.nonNull(couponServiceType)){ + wrapper.eq("coupon_service_type",couponServiceType); + } + // 开始,结束时间 + if(StringUtils.hasLength(createTime)){ + String[] split = createTime.split(" - "); + Date startTime = DateUtil.getDate_str4(split[0]); + Date endTime = DateUtil.getDate_str4(split[1]); + wrapper.between("create_time",startTime,endTime); + } + wrapper.ne("status", StatusEnum.DELETE.getCode()); + wrapper.orderBy(true,"create_time",false); + return tCouponService.selectList(wrapper); + } + + /** + * 获取活动券列表 + */ + @RequestMapping(value = "/activityCouponList") + @ResponseBody + public Object activityCouponList(String couponName) { + EntityWrapper<TCoupon> wrapper = new EntityWrapper<>(); + if(StringUtils.hasLength(couponName)){ + wrapper.like("coupon_name",couponName); + } + wrapper.eq("coupon_type",1); + wrapper.eq("coupon_state",1); + wrapper.orderBy(true,"create_time",false); return tCouponService.selectList(wrapper); } @@ -94,6 +130,11 @@ @RequestMapping(value = "/add") @ResponseBody public Object add(TCoupon tCoupon) { + // 校验是否添加的是同类型同名称的优惠券 + Boolean isExit = tCouponService.isExit(tCoupon); + if(isExit){ + return new SuccessTip(500,"该优惠券名称与类型已存在!"); + } tCouponService.insert(tCoupon); return SUCCESS_TIP; } @@ -104,7 +145,37 @@ @RequestMapping(value = "/delete") @ResponseBody public Object delete(@RequestParam Integer tCouponId) { + /*TCoupon tCoupon = tCouponService.selectById(tCouponId); + tCoupon.setCouponStatus(StatusEnum.DELETE.getCode()); + tCouponService.updateById(tCoupon);*/ tCouponService.deleteById(tCouponId); + return SUCCESS_TIP; + } + + /** + * 修改优惠券状态 + */ + @RequestMapping(value = "/update-status") + @ResponseBody + public Object updateStatus(Integer id,Integer status) { + TCoupon tCoupon = tCouponService.selectById(id); + + // 查询已启用的新人券数量 + int count = tCouponService.selectCount(new EntityWrapper<TCoupon>().eq("coupon_state", 1) + .eq("coupon_type",2)); + + // 判断是否为新人券,新人券只可启用一条记录 + if(count > 0 && 2 == tCoupon.getCouponType() && 2 == status){ + return new SuccessTip(500,"已有启动的新人券!"); + } + + if(1 == status){ + tCoupon.setCouponState(2); + } + if(2 == status){ + tCoupon.setCouponState(1); + } + tCouponService.updateById(tCoupon); return SUCCESS_TIP; } @@ -137,8 +208,27 @@ List<Integer> userIds = couponSendReq.getUserIds(); + // 查询选择的优惠券 + TCoupon tCoupon = tCouponService.selectById(couponSendReq.getCouponId()); + + List<TUserToCoupon> tUserToCoupons = new ArrayList<>(userIds.size()); + + for (Integer userId : userIds) { + // 创建用户优惠券关联表 + TUserToCoupon tUserToCoupon = new TUserToCoupon(); + tUserToCoupon.setCouponId(tCoupon.getId()); + tUserToCoupon.setUserId(userId); + tUserToCoupon.setCouponTotal(1); + tUserToCoupon.setValidCount(1); + Date expireTime = Date.from(LocalDate.now().plusDays(tCoupon.getCouponValidity()).atStartOfDay().atZone(ZoneId.systemDefault()).toInstant()); + System.err.println(expireTime); + tUserToCoupon.setExpireTime(expireTime); + tUserToCoupons.add(tUserToCoupon); + } + tUserToCouponService.insertBatch(tUserToCoupons); + // 查询该优惠券的列表 - List<TCoupon> tCoupons = tCouponService.selectList(new EntityWrapper<TCoupon>().eq("coupon_name", couponSendReq.getCouponName()) + /*List<TCoupon> tCoupons = tCouponService.selectList(new EntityWrapper<TCoupon>().eq("coupon_name", couponSendReq.getCouponName()) .eq("coupon_status",CouponStatusEnum.UNISSUED.getCode())); Assert.isTrue(!CollectionUtils.isEmpty(tCoupons),"该优惠券不存在!"); List<TCoupon> tCouponList = new ArrayList<>(); @@ -169,7 +259,7 @@ } if(!CollectionUtils.isEmpty(tCouponList)){ tCouponService.updateBatchById(tCouponList); - } + }*/ return SUCCESS_TIP; } -- Gitblit v1.7.1