10.13bug2

nickchange

2023-10-13 edf83149d0f26fb99eb6548d9e68bcc81a8cc893

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

@@ -15,6 +15,8 @@
import com.dsh.activity.model.CoachChangeStateVO;
import com.dsh.activity.model.PointMerchandiseIncomeVo;
import com.dsh.activity.model.PointMerchandiseVo;
import com.dsh.activity.model.WriteOffDTO;
import com.dsh.activity.model.QueryDataFee;
import com.dsh.activity.model.request.*;
import com.dsh.activity.model.response.GoodsInfoOneVo;
import com.dsh.activity.model.response.StoreVos;
@@ -75,6 +77,11 @@

    @Resource
    private CouponCityService ccityService;


    @Resource
    private PointsMerchandiseCityService pmdsCityService;

    @Autowired
    private UserPointsMerchandiseService userPointsMerchandiseService;

@@ -84,6 +91,19 @@
    @RequestMapping("/base/pointMerchars/changeState")
    public Object changeState(@RequestBody CoachChangeStateVO dto){
        return pmdsService.changeState(dto);
    }
    /**
     * 门票核销
     */
    @RequestMapping("/base/pointMerchars/writeOff")
    public Object writeOff(@RequestBody WriteOffDTO dto){
        UserPointsMerchandise byId = userPointsMerchandiseService.getById(dto.getId());
        byId.setStoreId(dto.getVerifiStoreId());
        byId.setStatus(2);
        byId.setVerificationTime(new Date());
        byId.setUserId(null);
        byId.setVerificationUserId(dto.getVerificationUserId());
        return userPointsMerchandiseService.updateById(byId);
    }
    @ResponseBody
    @PostMapping("/base/pointMerchars/ticketList")
@@ -148,9 +168,6 @@
        return  userPointsMerchandiseService.getAmount();
    }

    @Resource
    private PointsMerchandiseCityService pmdsCityService;


    @ResponseBody
    @PostMapping("/base/pointMerchars/convertGoods")
@@ -164,7 +181,8 @@
            for (PointsMerchandise merchandise : merchandises) {
                IntegralCommodity integralCommodity = new IntegralCommodity();
                integralCommodity.setCommodityId(merchandise.getId());
                integralCommodity.setCommodityImg(merchandise.getProductImages());
                String[] split = merchandise.getProductImages().split(",");
                integralCommodity.setCommodityImg(split[0]);
                integralCommodity.setCommodityName(merchandise.getName());
                integralCommodity.setCommodityPrice(merchandise.getPrice());
                integralCommodity.setGoodsType(merchandise.getType());
@@ -623,7 +641,6 @@




    public int dealTimeStatus(String startTime, String endTime){
        LocalDate now = LocalDate.now();
        LocalDate start = LocalDate.parse(startTime);
@@ -1016,4 +1033,69 @@

    }


    @PostMapping("/base/pointMerchars/queryFee")
    @ResponseBody
    public HashMap<String, Object> queryFee(@RequestBody QueryDataFee queryDataFee){
        HashMap<String, Object> map = new HashMap<>();
        String data = queryDataFee.getData();
        List<Integer> ids = queryDataFee.getIds();
        if(ids.size()==0){
            ids.add(-1);
        }
        List<PointsMerchandise> list1 = pmdsService.list(new LambdaQueryWrapper<PointsMerchandise>().eq(PointsMerchandise::getRedemptionMethod, 3));
        LambdaQueryWrapper<UserPointsMerchandise> vipPaymentLambdaQueryWrapper = new LambdaQueryWrapper<>();
        if(ToolUtil.isNotEmpty(data)){
            String stime = data.split(" - ")[0]+" 00:00:00";
            String etime = data.split(" - ")[1]+" 23:59:59";
            vipPaymentLambdaQueryWrapper.between(UserPointsMerchandise::getInsertTime,stime,etime);
        }
        vipPaymentLambdaQueryWrapper.in(UserPointsMerchandise::getUserId,ids);
        List<Integer> collect = list1.stream().map(PointsMerchandise::getId).collect(Collectors.toList());
        if(collect.size()==0){
            collect.add(-1);
        }
        vipPaymentLambdaQueryWrapper.in(UserPointsMerchandise::getPointsMerchandiseId,collect);
        vipPaymentLambdaQueryWrapper.eq(UserPointsMerchandise::getPayStatus,2);
        ArrayList<Integer> objects = new ArrayList<>();
        List<UserPointsMerchandise> list = upmseService.list(vipPaymentLambdaQueryWrapper);

        double a =0;
        double d =0;
        double m =0;
        double j =0;
        double y =0;
        for (UserPointsMerchandise userPointsMerchandise : list) {
            for (PointsMerchandise pointsMerchandise : list1) {
                if(pointsMerchandise.getId()==userPointsMerchandise.getPointsMerchandiseId()){
                    a += pointsMerchandise.getCash().doubleValue();
                }
                if(pointsMerchandise.getType()==3){
                    if(pointsMerchandise.getCardType()==1){
                        d += pointsMerchandise.getCash().doubleValue();
                    }
                    if(pointsMerchandise.getCardType()==2){
                        m += pointsMerchandise.getCash().doubleValue();
                    }
                    if(pointsMerchandise.getCardType()==3){
                        j += pointsMerchandise.getCash().doubleValue();
                    }
                    if(pointsMerchandise.getCardType()==4){
                        y += pointsMerchandise.getCash().doubleValue();
                    }
                }
            }

        }

        map.put("all",a);
        map.put("day",d);
        map.put("month",m);
        map.put("quarter",j);
        map.put("year",y);
        return map;


    }

}