Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai

44323

2023-11-27 aa925d851857f50eff0556411366690d9a78a0e5

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

@@ -24,10 +24,7 @@
import com.dsh.activity.model.response.GoodsInfoOneVo;
import com.dsh.activity.model.response.StoreVos;
import com.dsh.activity.service.*;
import com.dsh.activity.util.GDMapGeocodingUtil;
import com.dsh.activity.util.StrUtils;
import com.dsh.activity.util.TokenUtil;
import com.dsh.activity.util.ToolUtil;
import com.dsh.activity.util.*;
import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -98,6 +95,7 @@

         pmdsService.changeState(dto);
    }

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

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



    @RequestMapping("/base/pointMerchars/writeOff")
@@ -128,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){
@@ -240,6 +240,7 @@
        }
        return result;
    }

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

    /**
     * 获取积分商票消费金额
     */
@@ -278,6 +280,12 @@
        return  userPointsMerchandiseService.getAmount();
    }


    @Resource
    private StoreClient storeClient;

    @Autowired
    private PointsMerchandiseStoreService pointsMerchandiseStoreService;

    @ResponseBody
    @PostMapping("/base/pointMerchars/convertGoods")
@@ -289,15 +297,36 @@
        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(null != geocode) {

        List<Store> stores = storeClient.queryStoreList(new QueryStoreList(provinceCode, cityCode));
        Store s = null;
        Double d = 0D;
        for (Store store : stores) {
            Map<String, Double> distance = GeodesyUtil.getDistance(location.getLon() + "," + location.getLat(), store.getLon() + "," + store.getLat());
            Double wgs84 = distance.get("WGS84");
            if (s == null || d > wgs84) {
                s = store;
                d = wgs84;
        }
        }
//        }

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

        List<PointsMerchandiseStore> storesids = pointsMerchandiseStoreService.list(new QueryWrapper<PointsMerchandiseStore>().eq("storeId", s.getId()));
        for (PointsMerchandiseStore storesid : storesids) {
            cIds.add(storesid.getPointsMerchandiseId());
        }


//        if (cIds.size()>0) {

            List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
        List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>().in("id", cIds)
                    .eq("state", 1)
                    .eq("shelves", 1)
                    .gt("endTime", new Date()).last("ORDER BY sort desc,insertTime desc"));
@@ -318,6 +347,7 @@
        System.out.println(commodity);
        return commodity;
    }

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



        PointMerchandiseVo pointMerchandiseVo = new PointMerchandiseVo();
@@ -567,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) {
@@ -725,7 +754,6 @@
//                        .eq("pointsMerchandiseId",merchandise.getId() ));



                int couponCounts = userCouponService.count(new QueryWrapper<UserCoupon>().eq("couponId", coupon.getId()));
//                detailsVo.setRedeemedNum(coupon.getPickUpQuantity());
                detailsVo.setRedeemedNum(couponCounts);
@@ -841,6 +869,8 @@
                            List<Integer> rid= stoClient.querySiteIdById(storeIds);
                            detailsResponse.setRid(rid);
                        }


                    }else if(merchandise.getUseScope()==3){
                        // 指定门店
                        List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>()
@@ -876,6 +906,8 @@
                            }
                        }
                    }


                    if (merchandise.getCardType()==1){
                        SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
                        Calendar calendar = Calendar.getInstance();
@@ -1047,8 +1079,6 @@
                    detailsVo.setOrderTime(format);




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




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



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

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



                        Calendar calendar = Calendar.getInstance();
@@ -1150,9 +1176,6 @@
                        }

                    }





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



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

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

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

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



    }


@@ -1408,7 +1432,6 @@
    }

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



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




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



    @ResponseBody