ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/factory/RemoteCouponFallbackFactory.java
@@ -38,7 +38,7 @@ } @Override public R<MerVerifyCouponGetVo> getVerifyCoupon(String verifyCoupon) { public R<MerVerifyCouponGetVo> getVerifyCoupon(Long verifyCoupon) { return R.fail("获取核销优惠券失败:" + throwable.getMessage()); }
@@ -40,7 +40,7 @@ * @return R<MerVerifyCouponGetVo> */ @PostMapping("/coupon/getVerifyCoupon") public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody String verifyCoupon); public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody Long verifyCoupon); /** * @description 发送用户优惠券礼物 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/controller/console/CouponController.java
@@ -55,7 +55,7 @@ * @return R<MerVerifyCouponGetVo> */ @PostMapping("/getVerifyCoupon") public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody String verifyCoupon) public R<MerVerifyCouponGetVo> getVerifyCoupon(@RequestBody Long verifyCoupon) { MerVerifyCouponGetVo verifyCouponGetVo = memberCouponService.getVerifyCoupon(verifyCoupon); return R.ok(verifyCouponGetVo); @@ -69,7 +69,7 @@ * @return R<MerVerifyCouponGetVo> */ @PostMapping("/sureVerifyCoupon") public R<MerVerifyCouponGetVo> sureVerifyCoupon(@RequestBody String memberCouponId) public R<MerVerifyCouponGetVo> sureVerifyCoupon(@RequestBody Long memberCouponId) { MerVerifyCouponGetVo verifyCouponGetVo = memberCouponService.sureVerifyCoupon(memberCouponId); return R.ok(verifyCouponGetVo); ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MemberSelectCouponDto.java
@@ -17,6 +17,6 @@ private String goodsId; @ApiModelProperty(value = "会员选择优惠券id") private String memberCouponId; private Long memberCouponId; } ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/AppMemberCouponPageVo.java
@@ -18,7 +18,7 @@ public class AppMemberCouponPageVo { @ApiModelProperty(value = "用户优惠券id") private String memberCouponId; private Long memberCouponId; @ApiModelProperty(value = "优惠券名称") private String couponName; ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/coupon/CouponServiceImpl.java
@@ -1234,7 +1234,6 @@ Coupon coupon; List<MemberCoupon> memberCouponList = new ArrayList<>(); MemberCoupon memberCoupon; String memberCouponId; // 遍历生日礼物发送DTO列表 for(BirthdayGiftSendDto birthdayGiftSendDto : giftSendDtoList){ @@ -1248,9 +1247,6 @@ // 根据优惠券数量生成会员优惠券列表 for(int i=0;i<birthdayGiftSendDto.getCouponNumber();i++){ memberCoupon = new MemberCoupon(); //TODO memberCouponId = IdUtils.simpleUUID(); //memberCoupon.setId(memberCouponId); memberCoupon.setDelFlag(0); memberCoupon.setCouponId(couponId); memberCoupon.setUserId(userId); @@ -1421,8 +1417,6 @@ } //生成用户优惠券 MemberCoupon memberCoupon = new MemberCoupon(); //String memberCouponId = IdUtils.simpleUUID(); //memberCoupon.setId(memberCouponId); memberCoupon.setDelFlag(0); memberCoupon.setCouponId(couponId); memberCoupon.setUserId(userId); ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/impl/member/MemberCouponServiceImpl.java
@@ -76,7 +76,7 @@ * @return void */ @Override public MerVerifyCouponGetVo getVerifyCoupon(String verifyCoupon){ public MerVerifyCouponGetVo getVerifyCoupon(Long verifyCoupon){ MemberCoupon memberCoupon = this.getById(verifyCoupon); // 检查是否存在该优惠券 if (memberCoupon == null) { @@ -121,7 +121,7 @@ * @return MerVerifyCouponGetVo */ @Override public MerVerifyCouponGetVo sureVerifyCoupon(String memberCouponId){ public MerVerifyCouponGetVo sureVerifyCoupon(Long memberCouponId){ MemberCoupon memberCoupon = this.getById(memberCouponId); if(memberCoupon==null||memberCoupon.getDelFlag()==1){ throw new ServiceException(AppErrorConstant.COUPON_NO_FIND); @@ -311,8 +311,8 @@ List<MerMemberCouponVo> merMemberCouponVoList = memberCouponMapper.listMerShopGoodsMemberCoupon(merGoodsCouponListDto); if(merMemberCouponVoList!=null&&merMemberCouponVoList.size()>0){ List<MemberSelectCouponDto> goodsCpuponList = merGoodsCouponListDto.getGoodsCpuponList(); List<String> selectCouponList = new ArrayList<>(); Map<String, String> selectCouponMap = new HashMap<>(); List<Long> selectCouponList = new ArrayList<>(); Map<Long, String> selectCouponMap = new HashMap<>(); Boolean checkSelect = false; if(merGoodsCouponListDto.getGoodsCpuponList()!=null&&merGoodsCouponListDto.getGoodsCpuponList().size()>0) { for (MemberSelectCouponDto couponDto : goodsCpuponList) { ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/service/member/MemberCouponService.java
@@ -39,7 +39,7 @@ * @param verifyCoupon * @return void */ MerVerifyCouponGetVo getVerifyCoupon(String verifyCoupon); MerVerifyCouponGetVo getVerifyCoupon(Long verifyCoupon); /** * @description 核销优惠券 @@ -48,7 +48,7 @@ * @param memberCouponId * @return MerVerifyCouponGetVo */ MerVerifyCouponGetVo sureVerifyCoupon(String memberCouponId); MerVerifyCouponGetVo sureVerifyCoupon(Long memberCouponId); /** * @description ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/AppBuyGoodsDto.java
@@ -23,6 +23,6 @@ private Integer buyNum; @ApiModelProperty(value = "用户优惠券id") private String memberCouponId; private Long memberCouponId; } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/dto/MerVerifyCouponDto.java
@@ -15,7 +15,7 @@ public class MerVerifyCouponDto extends MerBaseDto { @ApiModelProperty(value = "优惠券id") private String memberCouponId; private Long memberCouponId; } ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/AppSureOrderGoodsVo.java
@@ -41,7 +41,7 @@ private Integer buyNum; @ApiModelProperty(value = "优惠券id") private String memberCouponId; private Long memberCouponId; @ApiModelProperty(value = "商品售价") @JsonSerialize(using = ToStringSerializer.class) ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -196,7 +196,7 @@ String goodsId; Integer buyNum; BigDecimal buyNumBig; String memberCouponId; Long memberCouponId; Goods goods; BigDecimal goodsPrice; BigDecimal goodsTotalPrice; @@ -226,7 +226,7 @@ BigDecimal orderPayDeposit = new BigDecimal("0.00"); BigDecimal orderPayMoney = new BigDecimal("0.00"); // 遍历购买商品列表 HashSet<String> userCouponIdSet = new HashSet<>(); HashSet<Long> userCouponIdSet = new HashSet<>(); for (AppBuyGoodsDto appBuyGoodsDto : appBuyGoodsDtoList) { appSureOrderGoodsVo = new AppSureOrderGoodsVo(); discountMoney = BigDecimal.ZERO; @@ -263,7 +263,7 @@ goodsTotalPrice = goodsPrice.multiply(buyNumBig); goodsRealPrice = goodsTotalPrice; // 处理优惠券 if (StringUtils.isNotBlank(memberCouponId)) { if (null != memberCouponId) { appMemberCouponVo = appMemberCouponVoMap.get(memberCouponId); if (StringUtils.isBlank(appMemberCouponVo.getRelGoodsIds()) || appMemberCouponVo.getRelGoodsIds().contains(goodsId)) { couponType = appMemberCouponVo.getCouponType(); @@ -559,7 +559,7 @@ BigDecimal buyNumBig; Integer serviceNum; Integer goodsNum = 0; String memberCouponId; Long memberCouponId; Goods goods = null; GoodsFile goodsFile; BigDecimal goodsPrice; @@ -663,7 +663,7 @@ discountMoney = goodsTotalPrice; } } memberCouponSJ.add(memberCouponId); memberCouponSJ.add(memberCouponId + ""); } appSureOrderGoodsVo.setUseCoupon(useCoupon); appSureOrderGoodsVo.setGoodsTotalPrice(goodsTotalPrice); @@ -2591,7 +2591,7 @@ BigDecimal buyNumBig; Integer serviceNum; Integer goodsNum = 0; String memberCouponId; Long memberCouponId; Goods goods; BigDecimal goodsPrice; BigDecimal goodsTotalPrice; @@ -2668,7 +2668,7 @@ goodsRealPrice = BigDecimal.ZERO; discountMoney = goodsTotalPrice.subtract(goodsRealPrice); } memberCouponSJ.add(memberCouponId); memberCouponSJ.add(memberCouponId + ","); } } goodsDeposit = goods.getSubscription(); @@ -4599,7 +4599,7 @@ // 创建MerVerifyCouponVo对象 MerVerifyCouponVo merVerifyCouponVo = new MerVerifyCouponVo(); // 调用remoteCouponService的getVerifyCoupon方法获取MerVerifyCouponGetVo对象 MerVerifyCouponGetVo verifyCouponGetVo = remoteCouponService.getVerifyCoupon(verifyCode).getData(); MerVerifyCouponGetVo verifyCouponGetVo = remoteCouponService.getVerifyCoupon(Long.valueOf(verifyCode)).getData(); MemberCoupon memberCoupon = verifyCouponGetVo.getMemberCoupon(); // 检查优惠券状态 int couponStatus = memberCoupon.getCouponStatus();
