管理后台：积分商品的购买详情，列表页面；todo核销操作

lisy

2023-08-15 c6332a2118d9d8fe43d773495a403d4a9edf533d

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

@@ -12,9 +12,7 @@
import com.dsh.activity.feignclient.other.StoreClient;
import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
import com.dsh.activity.model.PointMerchandiseVo;
import com.dsh.activity.model.request.AppUserGoodResp;
import com.dsh.activity.model.request.CommodityRequest;
import com.dsh.activity.model.request.IntegralGoodsOfSearch;
import com.dsh.activity.model.request.*;
import com.dsh.activity.service.*;
import com.dsh.activity.util.GDMapGeocodingUtil;
import com.dsh.activity.util.StrUtils;
@@ -28,6 +26,7 @@
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.util.*;
import java.util.stream.Collectors;

@@ -540,8 +539,8 @@
        if (mapList.size() > 0){
            for (Map<String, Object> stringObjectMap : mapList) {
                Integer o = (Integer) stringObjectMap.get("id");
                Object startTime = stringObjectMap.get("startTime");
                Object endTime = stringObjectMap.get("endTime");
                String startTime = (String) stringObjectMap.get("startTime");
                String endTime = (String) stringObjectMap.get("endTime");
                stringObjectMap.put("timeValue",startTime + "至"+endTime);
                int count1 = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
                        .eq(UserPointsMerchandise::getPointsMerchandiseId, o));
@@ -550,16 +549,29 @@
                        .eq(UserPointsMerchandise::getStatus,2));
                stringObjectMap.put("hasExchangeQty",count1);
                stringObjectMap.put("hasPickQty",count2);

                stringObjectMap.put("activeStatus",dealTimeStatus(startTime,endTime));
            }
            if (ToolUtil.isNotEmpty(ofSearch.getActiveStatus())){
                mapList = dealTimeData(mapList,ofSearch.getActiveStatus());
            }
        }
        // TODO: 2023/8/14 state 活动状态
        System.out.println("mapList->"+mapList);
        return mapList;
    }

    public int dealTimeStatus(String startTime, String endTime){
        LocalDate now = LocalDate.now();
        LocalDate start = LocalDate.parse(startTime);
        LocalDate end = LocalDate.parse(endTime);
        if (now.isBefore(start)) {
            return 1; // 未开始
        } else if (now.isAfter(end)) {
            return 3; // 已结束
        } else {
            return 2; // 已开始
        }
    }

    /**
     *
@@ -606,4 +618,65 @@
        }
        return null;
    }


    @PostMapping("/base/pointMerchars/queryPointMerchaseDetailOfId")
    public PointMercharsVo queryPointMerchaseDetailOfId(@RequestBody Integer pointMercharsId){
        PointMercharsVo vo = new PointMercharsVo();
        PointsMerchandise byId = pmdsService.getById(pointMercharsId);
        if (ToolUtil.isNotEmpty(byId)){
            vo.setName(byId.getName());
            vo.setCover(byId.getCover());
            vo.setPics(byId.getProductImages());
            vo.setQuantityIssued(byId.getQuantityIssued());
            vo.setPickUpQuantity(byId.getPickUpQuantity());
            vo.setSort(byId.getSort());
            vo.setContent(byId.getRedemptionInstructions());
        }
        return vo;
    }


    @PostMapping("/base/pointMerchars/updateGoodsGroudingStatus")
    boolean updateGoodsGroudingStatus(@RequestBody Map<String,Integer> map){
        Integer id = map.get("id");
        Integer type = map.get("type");
        System.out.println(id);
        System.out.println(type);
        try {
            PointsMerchandise byId = pmdsService.getById(id);
            byId.setShelves(type);
            pmdsService.updateById(byId);
            return true;
        }catch (Exception e){
            return false;
        }
    }


    @ResponseBody
    @PostMapping("/base/pointMerchars/queryUserPayedGoodsList")
    public List<Map<String, Object>> queryUserPayedGoodsList(@RequestBody PointMercharsPayedVo pointMercharsPayedVo){
        System.out.println(pointMercharsPayedVo);
        List<Map<String, Object>>  mapList = new ArrayList<>();
        LambdaQueryWrapper<UserPointsMerchandise> userPointsMerchandiseLambdaQueryWrapper = new LambdaQueryWrapper<>();
        userPointsMerchandiseLambdaQueryWrapper.eq(UserPointsMerchandise::getPointsMerchandiseId,pointMercharsPayedVo.getId());
        if (ToolUtil.isNotEmpty(pointMercharsPayedVo.getStatus())){
            userPointsMerchandiseLambdaQueryWrapper.eq(UserPointsMerchandise::getStatus,pointMercharsPayedVo.getStatus());
        }
        List<UserPointsMerchandise> list = upmseService.list(userPointsMerchandiseLambdaQueryWrapper);
        System.out.println(list);
        if (list.size() > 0 ){
            for (UserPointsMerchandise pointsMerchandise : list) {
                Map<String, Object> map = new HashMap<>();
                map.put("id",pointsMerchandise.getId());
                map.put("userId",pointsMerchandise.getUserId());
                map.put("status", pointsMerchandise.getStatus());
                mapList.add(map);
            }
        }
        System.out.println(mapList);
        return mapList;
    }

}