From 36688cafd4ec450a1cf8055edfb4303c047eb083 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期一, 23 十月 2023 09:03:12 +0800
Subject: [PATCH] 修改bug
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 194 ++++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 193 insertions(+), 1 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index c818370..ac2c654 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -233,7 +233,191 @@
.eq("pointsMerchandiseId",goodId));
}
+ @PostMapping("/base/pointMerchars/getGoodDetailsWithIdOne")
+ public ProductDetailsVo getGoodDetailsWithIdOne(@RequestBody Integer id){
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ ProductDetailsVo detailsVo = new ProductDetailsVo();
+ PointsMerchandise merchandise = pmdsService.getById(id);
+ detailsVo.setCardType(merchandise.getCardType());
+ switch (merchandise.getType()){
+ case 2:
+// 课包
+ CoursePackage coursePackage = cpClient.queryCoursePackageById(merchandise.getCoursePackageId());
+ detailsVo.setGoodId(coursePackage.getId());
+ List<String> list1 = new ArrayList<>();
+ list1.add(coursePackage.getCoverDrawing());
+ list1.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ",")));
+ detailsVo.setPics(list1);
+ Collections.sort(detailsVo.getPics(), (s1, s2) -> {
+ if (s1.equals(coursePackage.getCoverDrawing())) {
+ return -1; // s1排在前面
+ } else if (s2.equals(coursePackage.getCoverDrawing())) {
+ return 1; // s2排在前面
+ } else {
+ return 0; // 保持原顺序
+ }
+ });
+ detailsVo.setGoodName(coursePackage.getName());
+ detailsVo.setBelongsScope(merchandise.getUserPopulation());
+ int coursePackageNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
+ .eq("pointsMerchandiseId",merchandise.getId() ));
+ detailsVo.setRedeemedNum(coursePackageNums);
+ detailsVo.setResidueNum(Math.max(merchandise.getQuantityIssued() - coursePackageNums, 0));
+ detailsVo.setPerLimit(merchandise.getPickUpQuantity());
+ if (merchandise.getRedemptionMethod() == 1){
+ detailsVo.setExchangeType(1);
+ detailsVo.setIntegral(merchandise.getIntegral());
+ }else {
+ detailsVo.setExchangeType(2);
+ detailsVo.setIntegral(merchandise.getIntegral());
+ detailsVo.setCash(merchandise.getCash());
+ }
+ detailsVo.setCost(merchandise.getPrice());
+ if (merchandise.getUseScope() == 1){
+ detailsVo.setExchangeAddrType(1);
+ detailsVo.setBelongs("全国通用");
+ }else if (merchandise.getUseScope() == 2){
+ detailsVo.setExchangeAddrType(2);
+ detailsVo.setBelongs(merchandise.getProvince()+"|"+merchandise.getCity() + "用户可用");
+ }else {
+ detailsVo.setExchangeAddrType(3);
+ List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
+ .eq("pointsMerchandiseId",merchandise.getId() ));
+ PointsMerchandiseStore pointsMerchandiseStore = list.get(0);
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(pointsMerchandiseStore.getStoreId());
+ detailsVo.setBelongs(courseOfStore.getStoreName()+"可用");
+ }
+ List<CoursePackagePaymentConfig> courseConfigList = cpcfigClient.getCourseConfigList(coursePackage.getId());
+
+ for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
+ if (Objects.equals(coursePackagePaymentConfig.getId(), merchandise.getCoursePackageConfigId())){
+ detailsVo.setCourseHours(coursePackagePaymentConfig.getClassHours());
+ break;
+ }
+ }
+ detailsVo.setStartTime(format.format(merchandise.getStartTime()));
+ detailsVo.setEndTime(format.format(merchandise.getEndTime()));
+
+ detailsVo.setContents(merchandise.getRedemptionInstructions());
+ detailsVo.setGoodType(merchandise.getType());
+
+ break;
+ case 1:
+ case 3:
+
+ detailsVo.setGoodId(merchandise.getId());
+ List<String> list2 = new ArrayList<>();
+ String cover = merchandise.getCover();
+ list2.addAll(Arrays.asList(StrUtils.splitStr2StrArr(merchandise.getProductImages(), ",")));
+ detailsVo.setPics(list2);
+ Collections.sort(detailsVo.getPics(), (s1, s2) -> {
+ if (s1.equals(merchandise.getCover())) {
+ return -1; // s1排在前面
+ } else if (s2.equals(merchandise.getCover())) {
+ return 1; // s2排在前面
+ } else {
+ return 0; // 保持原顺序
+ }
+ });
+ detailsVo.setPics(list2);
+ detailsVo.setGoodName(merchandise.getName());
+ detailsVo.setBelongsScope(merchandise.getUserPopulation());
+ int count = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
+ .eq("pointsMerchandiseId",merchandise.getId() ));
+ detailsVo.setRedeemedNum(count);
+ detailsVo.setResidueNum(Math.max(merchandise.getQuantityIssued() - count, 0));
+ detailsVo.setPerLimit(merchandise.getPickUpQuantity());
+ detailsVo.setExchangeType(merchandise.getRedemptionMethod());
+ if (merchandise.getRedemptionMethod() == 1){
+ detailsVo.setIntegral(merchandise.getIntegral());
+ }else {
+ detailsVo.setIntegral(merchandise.getIntegral());
+ detailsVo.setCash(merchandise.getCash());
+ }
+ detailsVo.setCost(merchandise.getPrice());
+ if (merchandise.getUseScope() == 1){
+ detailsVo.setExchangeAddrType(1);
+ detailsVo.setBelongs("全国通用");
+ }else if (merchandise.getUseScope() == 2){
+ detailsVo.setExchangeAddrType(2);
+ detailsVo.setBelongs(merchandise.getProvince()+"|"+merchandise.getCity() + "用户可用");
+ }else {
+ detailsVo.setExchangeAddrType(3);
+ List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
+ .eq("pointsMerchandiseId",merchandise.getId() ));
+ PointsMerchandiseStore pointsMerchandiseStore = list.get(0);
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(pointsMerchandiseStore.getStoreId());
+ detailsVo.setBelongs(courseOfStore.getStoreName()+"可用");
+ }
+
+ detailsVo.setStartTime(format.format(merchandise.getStartTime()));
+ detailsVo.setEndTime(format.format(merchandise.getEndTime()));
+
+ detailsVo.setContents(merchandise.getRedemptionInstructions());
+ detailsVo.setGoodType(merchandise.getType());
+ break;
+ case 4:
+// 优惠券
+ Coupon coupon = iCouponService.getById(id);
+ detailsVo.setGoodId(coupon.getId());
+ List<String> list3 = new ArrayList<>();
+ 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())) {
+ return -1; // s1排在前面
+ } else if (s2.equals(coupon.getCover())) {
+ return 1; // s2排在前面
+ } else {
+ return 0; // 保持原顺序
+ }
+ });
+ detailsVo.setGoodName(coupon.getName());
+ detailsVo.setBelongsScope(coupon.getUserPopulation());
+ int couponNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
+ .eq("pointsMerchandiseId",merchandise.getId() ));
+ detailsVo.setRedeemedNum(couponNums);
+ detailsVo.setResidueNum(Math.max(coupon.getQuantityIssued() - couponNums, 0));
+ detailsVo.setPerLimit(coupon.getPickUpQuantity());
+ detailsVo.setExchangeType(coupon.getRedemptionMethod());
+ if (coupon.getRedemptionMethod() == 1){
+ detailsVo.setIntegral(coupon.getIntegral().intValue());
+ }else {
+ detailsVo.setIntegral(coupon.getIntegral().intValue());
+ detailsVo.setCash(coupon.getCash());
+ }
+ if (coupon.getUseScope() == 1){
+ detailsVo.setExchangeAddrType(1);
+ detailsVo.setBelongs("全国通用");
+ }else if (coupon.getUseScope() == 2){
+ detailsVo.setExchangeAddrType(2);
+ List<CouponCity> list = ccityService.list(new LambdaQueryWrapper<CouponCity>()
+ .eq(CouponCity::getCouponId, coupon.getId()));
+ if (list.size() > 0){
+ detailsVo.setBelongs(list.get(0).getProvince()+"|"+list.get(0).getCity() + "用户可用");
+ }
+ }else {
+ detailsVo.setExchangeAddrType(3);
+ List<CouponStore> list = cstoreService.list(new QueryWrapper<CouponStore>()
+ .eq("couponId",coupon.getId() ));
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(list.get(0).getStoreId());
+ detailsVo.setBelongs(courseOfStore.getStoreName()+"可用");
+ }
+ detailsVo.setStartTime(format.format(coupon.getStartTime()));
+ detailsVo.setEndTime(format.format(coupon.getEndTime()));
+
+ detailsVo.setContents(coupon.getIllustrate());
+ detailsVo.setGoodType(4);
+ break;
+ default:
+ break;
+ }
+ return detailsVo;
+ }
@PostMapping("/base/pointMerchars/getGoodDetails")
public ProductDetailsVo getGoodDetailsWithId(@RequestBody ProductDetailRequest detailRequest){
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -637,7 +821,15 @@
@PostMapping("/base/pointMerchars/queryUserHasGoodsNums")
public int queryUserHasGoodsNums(@RequestBody AppUserGoodResp goodResp){
int count = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
- .eq(UserPointsMerchandise::getUserId,goodResp.getGoodId())
+ .eq(UserPointsMerchandise::getUserId,goodResp.getAppUserId())
+ .eq(UserPointsMerchandise::getPointsMerchandiseId,goodResp.getGoodId()));
+ System.out.println(count);
+ return count;
+ }
+ @ResponseBody
+ @PostMapping("/base/pointMerchars/queryUserHasGoodsNums1")
+ public int queryUserHasGoodsNums1(@RequestBody AppUserGoodResp goodResp){
+ int count = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
.eq(UserPointsMerchandise::getPointsMerchandiseId,goodResp.getGoodId()));
System.out.println(count);
return count;
--
Gitblit v1.7.1