cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java
@@ -40,7 +40,7 @@ @PostMapping("/base/pointMerchars/saveDetailsUserPointMercase") public void saveDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise); public void saveDetailsUserPointMercase( UserPointsMerchandise merchandise); @PostMapping("/base/pointMerchars/updateDetailsUserPointMercase") cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/model/UserPointsMerchandise.java
@@ -22,7 +22,7 @@ */ private Long id; /** * 优惠券id * 商品id */ private Integer pointsMerchandiseId; /** cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java
@@ -868,6 +868,23 @@ if (ToolUtil.isEmpty(tAppUser)){ return ResultUtil.error("用户不存在"); } // 查询是否超出限领数量 switch (exchangeType.getGoodsType()){ case 1: break; case 2: break; case 3: break; case 4: break; default: break; } int goodsNums = 0; if (ToolUtil.isEmpty(exchangeType.getNums())){ goodsNums = 1; @@ -879,6 +896,7 @@ UserPointsMerchandise pointsMerchandise = new UserPointsMerchandise(); pointsMerchandise.setPointsMerchandiseId(exchangeType.getGoodId()); pointsMerchandise.setUserId(userIdFormRedis); pointsMerchandise.setStatus(1); if (merchandise.getUseScope() == 3){ if (exchangeType.getGoodsType() == 2){ CoursePackage coursePackage = cpageClient.queryCoursePackageById(merchandise.getCoursePackageId()); cloud-server-account/src/main/java/com/dsh/account/service/impl/UserIntegralChangesServiceImpl.java
@@ -129,6 +129,7 @@ List<ExchangeDetailsResponse> detailsResponses = new ArrayList<>(); ExchangeDetailsVo integralExchangeDetails = mcClient.getIntegralExchangeDetails(userIdFormRedis); if (ToolUtil.isNotEmpty(integralExchangeDetails.getDetailsResponses())){ detailsResponses = integralExchangeDetails.getDetailsResponses(); if (ToolUtil.isNotEmpty(useType)){ detailsResponses = integralExchangeDetails.getDetailsResponses().stream() .filter(response -> Objects.equals(response.getUseStatus(), useType)) cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -257,8 +257,10 @@ Coupon coupon = iCouponService.getById(detailRequest.getGoodId()); detailsVo.setGoodId(coupon.getId()); List<String> list3 = new ArrayList<>(); list3.add(coupon.getCover()); list3.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coupon.getProductImages(), ","))); list3.add(ToolUtil.isEmpty(coupon.getCover()) ? "" : coupon.getCover()); if (ToolUtil.isNotEmpty(coupon.getProductImages())){ list3.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coupon.getProductImages(), ","))); } detailsVo.setPics(list3); Collections.sort(detailsVo.getPics(), (s1, s2) -> { if (s1.equals(coupon.getCover())) { @@ -276,12 +278,12 @@ detailsVo.setRedeemedNum(couponNums); detailsVo.setResidueNum(coupon.getQuantityIssued()-couponNums); detailsVo.setPerLimit(coupon.getPickUpQuantity()); detailsVo.setExchangeType(merchandise.getRedemptionMethod()); if (merchandise.getRedemptionMethod() == 1){ detailsVo.setIntegral(merchandise.getIntegral()); detailsVo.setExchangeType(coupon.getRedemptionMethod()); if (coupon.getRedemptionMethod() == 1){ detailsVo.setIntegral(coupon.getIntegral().intValue()); }else { detailsVo.setIntegral(merchandise.getIntegral()); detailsVo.setCash(merchandise.getCash()); detailsVo.setIntegral(coupon.getIntegral().intValue()); detailsVo.setCash(coupon.getCash()); } if (coupon.getUseScope() == 1){ detailsVo.setBelongs("全国通用"); @@ -297,8 +299,8 @@ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(list.get(0).getStoreId()); detailsVo.setBelongs(courseOfStore.getStoreName()+"可用"); } detailsVo.setStartTime(format.format(merchandise.getStartTime())); detailsVo.setEndTime(format.format(merchandise.getEndTime())); detailsVo.setStartTime(format.format(coupon.getStartTime())); detailsVo.setEndTime(format.format(coupon.getEndTime())); detailsVo.setContents(coupon.getIllustrate()); detailsVo.setGoodType(4); @@ -334,7 +336,7 @@ } detailsResponse.setStartTime(simpleDateFormat.format(merchandise.getStartTime())); detailsResponse.setEndTime(simpleDateFormat.format(merchandise.getEndTime())); detailsResponse.setUseStatus(pointsMerchandise.getStatus()); detailsResponse.setUseStatus(pointsMerchandise.getStatus() == 1 ? 2 : 1); detailsResponse.setGoodType(merchandise.getType()); responses.add(detailsResponse); } @@ -453,6 +455,7 @@ @PostMapping("/base/pointMerchars/saveDetailsUserPointMercase") public void saveDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise){ merchandise.setInsertTime(new Date()); upmseService.save(merchandise); }
@@ -1,6 +1,7 @@ package com.dsh.activity.entity; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.extension.activerecord.Model; @@ -34,10 +35,12 @@ /** * 积分商品id */ @TableField("pointsMerchandiseId") private Integer pointsMerchandiseId; /** * 门店id */ @TableField("storeId") private Integer storeId;
@@ -34,7 +34,7 @@ @TableId(value = "id", type = IdType.NONE) private Long id; /** * 优惠券id * 商品id */ @TableField("pointsMerchandiseId") private Integer pointsMerchandiseId; cloud-server-activity/src/main/java/com/dsh/activity/feignclient/MerChandiseClient.java
@@ -32,10 +32,6 @@ @PostMapping("/base/pointMerchars/selectPointsMerchandiseById") public PointsMerchandise selectPointsMerchandiseById(@RequestBody Integer speMercharsId); @PostMapping("/base/pointMerchars/saveDetailsUserPointMercase") public void saveDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise); @PostMapping("/base/pointMerchars/updateDetailsUserPointMercase") public void updateDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise);
