11.7

nickchange

2023-11-17 a9564eae9f0169ca39329b2f14a8f13d13358a0a

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

@@ -27,6 +27,7 @@
import com.dsh.activity.util.StrUtils;
import com.dsh.activity.util.TokenUtil;
import com.dsh.activity.util.ToolUtil;
import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

@@ -97,9 +98,17 @@
         pmdsService.changeState(dto);
    }
    /**
     * 门票核销
     * 根据id查询
     */

    @RequestMapping("/base/pointMerchars/getById")
    @ResponseBody
    public PointsMerchandise getById(@RequestBody Integer id){
        return pmdsService.getById(id);
    }
    /**
     * 门票核销
     */
    @RequestMapping("/base/course/changeState")
    @ResponseBody
    public Object changeState(@RequestBody CourseChangeStateDTO dto){
@@ -271,23 +280,39 @@

    @ResponseBody
    @PostMapping("/base/pointMerchars/convertGoods")
    public List<IntegralCommodity> getConvertibleGoods(){
    public List<IntegralCommodity> getConvertibleGoods(@RequestBody Location location) throws Exception {
        List<IntegralCommodity> commodity = new ArrayList<>();
        List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
                .eq("state",1)
                .eq("shelves",1)
                .gt("endTime",new Date()));
        if (merchandises.size() > 0){
            for (PointsMerchandise merchandise : merchandises) {
                IntegralCommodity integralCommodity = new IntegralCommodity();
                integralCommodity.setCommodityId(merchandise.getId());
                integralCommodity.setCommodityImg(merchandise.getCover());
                integralCommodity.setCommodityName(merchandise.getName());
                integralCommodity.setCommodityPrice(merchandise.getPrice());
                integralCommodity.setGoodsType(merchandise.getType());
                commodity.add(integralCommodity);

        Map<String, String> geocode = gdMapGeocodingUtil.geocode(location.getLon(), location.getLat());
        String provinceCode = geocode.get("provinceCode");
        String cityCode = geocode.get("cityCode");


        List<PointsMerchandiseCity> cityCode1 = pmdsCityService.list(new QueryWrapper<PointsMerchandiseCity>().eq("cityCode", cityCode));
        List<Integer> cIds = new ArrayList<>();
        for (PointsMerchandiseCity pointsMerchandiseCity : cityCode1) {
            cIds.add(pointsMerchandiseCity.getPointsMerchandiseId());
        }

        if (cIds.size()>0) {

            List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
                    .eq("state", 1)
                    .eq("shelves", 1).in("id", cIds)
                    .gt("endTime", new Date()));
            if (merchandises.size() > 0){
                for (PointsMerchandise merchandise : merchandises) {
                    IntegralCommodity integralCommodity = new IntegralCommodity();
                    integralCommodity.setCommodityId(merchandise.getId());
                    integralCommodity.setCommodityImg(merchandise.getCover());
                    integralCommodity.setCommodityName(merchandise.getName());
                    integralCommodity.setCommodityPrice(merchandise.getPrice());
                    integralCommodity.setGoodsType(merchandise.getType());
                    commodity.add(integralCommodity);
                }
            }
        }

        System.out.println(commodity);
        return commodity;
    }
@@ -558,10 +583,13 @@

//                detailsVo.setGoodId(coursePackage.getId());
                detailsVo.setGoodId(merchandise.getId());
                List<String> list1 = new ArrayList<>();
                list1.add(coursePackage.getCoverDrawing());
                list1.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ",")));
                detailsVo.setPics(list1);
//                List<String> list1 = new ArrayList<>();
//                list1.add(coursePackage.getCoverDrawing());
//                list1.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ",")));

                String productImages = merchandise.getProductImages();
                String[] list1 = productImages.split(",");
                detailsVo.setPics(Arrays.asList(list1));
                Collections.sort(detailsVo.getPics(), (s1, s2) -> {
                    if (s1.equals(coursePackage.getCoverDrawing())) {
                        return -1; // s1排在前面
@@ -751,12 +779,20 @@
        List<ExchangeDetailsResponse> responses = new ArrayList<>();
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        List<UserPointsMerchandise> pointsMerchandises = upmseService.list(new QueryWrapper<UserPointsMerchandise>()
                .eq("userId",appUserId ));
                .eq("userId",appUserId ).eq("payStatus",2));


        List<UserCoupon> userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId));


        List<Coupon> list1 = couponService.list();
        List<Integer> ids = new ArrayList<>();
        for (Coupon coupon : list1) {
            if (coupon.getDistributionMethod()==1) {
                ids.add(coupon.getId());
            }
        }
        List<UserCoupon> userCoupons = new ArrayList<>();
        if (ids.size()>0) {
           userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId", ids));
        }
        if (pointsMerchandises.size() > 0 ){
            for (UserPointsMerchandise pointsMerchandise : pointsMerchandises) {
                PointsMerchandise merchandise = pmdsService.getById(pointsMerchandise.getPointsMerchandiseId());
@@ -910,8 +946,9 @@

        if (userCoupons.size()>0){
            for (UserCoupon userCoupon : userCoupons) {

                Coupon c = couponService.getById(userCoupon.getCouponId());
                if (c==null){
                if (c==null|| c.getRedemptionMethod()==null){
                    continue;
                }

@@ -946,7 +983,7 @@
    @ResponseBody
    @PostMapping("/base/pointMerchars/getSpecificsOfGoods")
    public PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId){
        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
         SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
        PointDetailsVo detailsVo = new PointDetailsVo();
        UserPointsMerchandise byId = upmseService.getById(speMercharsId);

@@ -954,6 +991,7 @@
            PointsMerchandise pmdsServiceById = pmdsService.getById(byId.getPointsMerchandiseId());
            // 2.0
            detailsVo.setCardType(pmdsServiceById.getCardType());
            detailsVo.setExchangeAddrType(pmdsServiceById.getUseScope());
            detailsVo.setExchangeType(pmdsServiceById.getRedemptionMethod());
            detailsVo.setGoodType(pmdsServiceById.getType());
            if (pmdsServiceById.getRedemptionMethod() == 1){
@@ -1131,8 +1169,9 @@
                    detailsVo.setBelongs(pmdsServiceById.getProvince()+pmdsServiceById.getCity());
                    break;
                case 3:
                    StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
                    detailsVo.setBelongs(courseOfStore.getStoreName()+" "+courseOfStore.getStoreAddr());
//                    StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
//                    detailsVo.setBelongs(courseOfStore.getStoreName()+" "+courseOfStore.getStoreAddr());
//                    detailsVo.setBelongs("---------------");
                    break;
                default:
                    break;
@@ -1219,7 +1258,9 @@


    @PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
    public void updateDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise){
    public void  updateDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise){
        merchandise.setUserId(null);
        merchandise.setPointsMerchandiseId(null);
        upmseService.updateById(merchandise);
    }