重写课包支付和排课逻辑

puzhibing

2023-11-25 53e7558400dcacecdce70e39ebfe1727740f9296

 cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java

@@ -95,6 +95,7 @@

         pmdsService.changeState(dto);
    }

    /**
     * 根据id查询
     */
@@ -104,6 +105,7 @@
    public PointsMerchandise getById(@RequestBody Integer id){
        return pmdsService.getById(id);
    }

    /**
     * 门票核销
     */
@@ -112,7 +114,6 @@
    public Object changeState(@RequestBody CourseChangeStateDTO dto){
        return userPointsMerchandiseService.changeState(dto);
    }



    @RequestMapping("/base/pointMerchars/writeOff")
@@ -125,10 +126,12 @@
        byId.setVerificationUserId(dto.getVerificationUserId());
        return userPointsMerchandiseService.updateById(byId);
    }

    @Autowired
    private OperatorClient operatorClient;
    @Resource
    private CouponCityService cityService;

    @ResponseBody
    @PostMapping("/base/pointMerchars/ticketList")
    public List<Map<String,Object>> ticketList(@RequestBody IntegralGoodsOfSearch ofSearch){
@@ -237,6 +240,7 @@
        }
        return result;
    }

    @ResponseBody
    @PostMapping("/base/pointMerchars/queryGoodsListSearch")
    public List<Map<String,Object>> getIntegralGoodsListOfSearch(@RequestBody IntegralGoodsOfSearch ofSearch){
@@ -266,6 +270,7 @@
        System.out.println("mapList->"+mapList);
        return mapList;
    }

    /**
     * 获取积分商票消费金额
     */
@@ -281,6 +286,7 @@

    @Autowired
    private PointsMerchandiseStoreService pointsMerchandiseStoreService;

    @ResponseBody
    @PostMapping("/base/pointMerchars/convertGoods")
    public List<IntegralCommodity> getConvertibleGoods(@RequestBody Location location) throws Exception {
@@ -341,6 +347,7 @@
        System.out.println(commodity);
        return commodity;
    }

@Resource
private CoursePackageClient coursePackageClient;
    @Autowired
@@ -361,7 +368,6 @@
//            return pointMerchandiseVo;
//
//        }



        PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
@@ -590,12 +596,12 @@

    @Autowired
    private UserCouponService userCouponService;

    @PostMapping("/base/pointMerchars/getGoodDetails")
    public ProductDetailsVo getGoodDetailsWithId(@RequestBody ProductDetailRequest detailRequest){
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
        ProductDetailsVo detailsVo = new ProductDetailsVo();
        PointsMerchandise merchandise = pmdsService.getById(detailRequest.getGoodId());



        if (merchandise!=null) {
@@ -746,7 +752,6 @@
                detailsVo.setBelongsScope(coupon.getUserPopulation());
//                int couponNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
//                        .eq("pointsMerchandiseId",merchandise.getId() ));



                int couponCounts = userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()));
@@ -1051,8 +1056,6 @@
                    detailsVo.setOrderTime(format);




                    list2.add(pmdsServiceById.getCover());
                    detailsVo.setPics(list2);
                    Collections.sort(detailsVo.getPics(), (s1, s2) -> {
@@ -1064,8 +1067,6 @@
                            return 0; // 保持原顺序
                        }
                    });




                    if (pmdsServiceById.getCardType()==1){
@@ -1103,7 +1104,6 @@
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");



                        Calendar calendar = Calendar.getInstance();
                        calendar.setTime(byId.getInsertTime());
                        calendar.add(Calendar.DAY_OF_MONTH, 31);
@@ -1120,7 +1120,6 @@

                    } else if (pmdsServiceById.getCardType()==3) {
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");



                        Calendar calendar = Calendar.getInstance();
@@ -1154,9 +1153,6 @@
                        }

                    }





                    break;
@@ -1258,7 +1254,6 @@
//                        .eq("pointsMerchandiseId",merchandise.getId() ));



            int couponCounts = userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()));
//                detailsVo.setRedeemedNum(coupon.getPickUpQuantity());
//            detailsVo.setRedeemedNum(couponCounts);
@@ -1346,6 +1341,7 @@

    /**
     * 获取用户已兑换商品的数量
     *
     * @param goodResp
     * @return 数量
     */
@@ -1358,6 +1354,7 @@
        System.out.println(count);
        return count;
    }

    @ResponseBody
    @PostMapping("/base/pointMerchars/queryUserHasGoodsNums1")
    public int queryUserHasGoodsNums1(@RequestBody AppUserGoodResp goodResp){
@@ -1370,6 +1367,7 @@

    /**
     * 变更兑换商品的的状态
     *
     * @param code
     * @return 数量
     */
@@ -1394,7 +1392,6 @@
       return   upmseService.getConsumeDetails(requestVo);



    }


@@ -1412,7 +1409,6 @@
    }

    /**
     *
     * @param mapLists
     * @param timeType  1=未开始 2=已开始 3=已结束
     * @return
@@ -1655,7 +1651,6 @@
    }



    @ResponseBody
    @PostMapping("/base/pointMerchars/updateGoodsDetail")
    public boolean updateGoodsDetail(@RequestBody Map<String, Object> map){
@@ -1711,8 +1706,6 @@
    }




    @PostMapping("/base/pointMerchars/addOther")
    public Boolean addOther(@RequestBody String pam){
        Boolean save =false;
@@ -1763,7 +1756,6 @@
            return false;
        }
    }



    @ResponseBody