From 6eed4f4600ba2c2d7b5d3cc14a1e0a9e4d8f0d83 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 17 十月 2023 10:09:19 +0800
Subject: [PATCH] 10.17
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 480 +++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 446 insertions(+), 34 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
index b916ad3..50e420e 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java
@@ -10,9 +10,16 @@
import com.dsh.activity.feignclient.course.model.CoursePackagePaymentConfig;
import com.dsh.activity.feignclient.model.*;
import com.dsh.activity.feignclient.other.StoreClient;
+import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.feignclient.other.model.StoreDetailOfCourse;
+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;
import com.dsh.activity.service.*;
import com.dsh.activity.util.GDMapGeocodingUtil;
import com.dsh.activity.util.StrUtils;
@@ -72,6 +79,96 @@
private CouponCityService ccityService;
+ @Resource
+ private PointsMerchandiseCityService pmdsCityService;
+
+ @Autowired
+ private UserPointsMerchandiseService userPointsMerchandiseService;
+
+ /**
+ * 门票上下架 state=1 上架 state=2 下架
+ */
+ @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")
+ public List<Map<String,Object>> ticketList(@RequestBody IntegralGoodsOfSearch ofSearch){
+ List<Map<String, Object>> result = pmdsService.ticketList(ofSearch);
+ if (result.size() > 0){
+ for (Map<String, Object> stringObjectMap : result) {
+ Integer o = (Integer) stringObjectMap.get("id");
+ 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));
+ int count2 = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
+ .eq(UserPointsMerchandise::getPointsMerchandiseId, o)
+ .eq(UserPointsMerchandise::getStatus,2));
+ stringObjectMap.put("hasExchangeQty",count1);
+ stringObjectMap.put("hasPickQty",count2);
+
+ stringObjectMap.put("activeStatus",dealTimeStatus(startTime,endTime));
+ }
+ if (ToolUtil.isNotEmpty(ofSearch.getActiveStatus())){
+ result = dealTimeData(result,ofSearch.getActiveStatus());
+ }
+ }
+ return result;
+ }
+ @ResponseBody
+ @PostMapping("/base/pointMerchars/queryGoodsListSearch")
+ public List<Map<String,Object>> getIntegralGoodsListOfSearch(@RequestBody IntegralGoodsOfSearch ofSearch){
+ System.out.println(ofSearch);
+ List<Map<String, Object>> mapList = pmdsService.queryGoodsListOfSearch(ofSearch);
+ if (mapList.size() > 0){
+ for (Map<String, Object> stringObjectMap : mapList) {
+ Integer o = (Integer) stringObjectMap.get("id");
+ 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));
+ int count2 = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
+ .eq(UserPointsMerchandise::getPointsMerchandiseId, o)
+ .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());
+ }
+ }
+ System.out.println("mapList->"+mapList);
+ return mapList;
+ }
+ /**
+ * 获取积分商票消费金额
+ */
+ @ResponseBody
+ @RequestMapping("/base/pointMerchars/getAmount")
+ public List<PointMerchandiseIncomeVo> getAmount(){
+ return userPointsMerchandiseService.getAmount();
+ }
+
+
@ResponseBody
@PostMapping("/base/pointMerchars/convertGoods")
public List<IntegralCommodity> getConvertibleGoods(){
@@ -84,7 +181,7 @@
for (PointsMerchandise merchandise : merchandises) {
IntegralCommodity integralCommodity = new IntegralCommodity();
integralCommodity.setCommodityId(merchandise.getId());
- integralCommodity.setCommodityImg(merchandise.getProductImages());
+ integralCommodity.setCommodityImg(merchandise.getCover());
integralCommodity.setCommodityName(merchandise.getName());
integralCommodity.setCommodityPrice(merchandise.getPrice());
integralCommodity.setGoodsType(merchandise.getType());
@@ -213,7 +310,6 @@
detailsVo.setGoodId(merchandise.getId());
List<String> list2 = new ArrayList<>();
String cover = merchandise.getCover();
- list2.add(cover);
list2.addAll(Arrays.asList(StrUtils.splitStr2StrArr(merchandise.getProductImages(), ",")));
detailsVo.setPics(list2);
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
@@ -361,7 +457,7 @@
@ResponseBody
@PostMapping("/base/pointMerchars/getSpecificsOfGoods")
- public PointDetailsVo getSpecificsOfGoods(@RequestBody Integer speMercharsId){
+ public PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId){
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
PointDetailsVo detailsVo = new PointDetailsVo();
UserPointsMerchandise byId = upmseService.getById(speMercharsId);
@@ -382,7 +478,8 @@
switch (pmdsServiceById.getType()){
case 1:
case 3:
- List<String> list2 = Arrays.asList(StrUtils.splitStr2StrArr(pmdsServiceById.getProductImages(), ","));
+ List<String> list10 = Arrays.asList(StrUtils.splitStr2StrArr(pmdsServiceById.getProductImages(), ","));
+ ArrayList<String> list2 = new ArrayList<>(list10);
list2.add(pmdsServiceById.getCover());
detailsVo.setPics(list2);
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
@@ -397,7 +494,8 @@
break;
case 2:
CoursePackage coursePackage = cpClient.queryCoursePackageById(pmdsServiceById.getCoursePackageId());
- List<String> list1 = Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ","));
+ List<String> list11 = Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ","));
+ ArrayList<String> list1 = new ArrayList<>(list11);
list1.add(coursePackage.getCoverDrawing());
detailsVo.setPics(list1);
CoursePackagePaymentConfig coursePackagePaymentConfig = cpClient.queryConfigCoursePackData(pmdsServiceById.getCoursePackageConfigId());
@@ -414,7 +512,8 @@
break;
case 4:
Coupon coupon = iCouponService.getById(pmdsServiceById.getId());
- List<String> list3 = Arrays.asList(StrUtils.splitStr2StrArr(coupon.getProductImages(), ","));
+ List<String> list13 = Arrays.asList(StrUtils.splitStr2StrArr(coupon.getProductImages(), ","));
+ ArrayList<String> list3 = new ArrayList<>(list13);
list3.add(coupon.getCover());
detailsVo.setPics(list3);
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
@@ -497,6 +596,9 @@
if (list.size() > 0){
storeIds = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
}
+ if(storeIds.size()==0){
+ storeIds.add(-1);
+ }
return storeIds;
}
@@ -536,34 +638,6 @@
}
- @ResponseBody
- @PostMapping("/base/pointMerchars/queryGoodsListSearch")
- public List<Map<String,Object>> getIntegralGoodsListOfSearch(@RequestBody IntegralGoodsOfSearch ofSearch){
- System.out.println(ofSearch);
- List<Map<String, Object>> mapList = pmdsService.queryGoodsListOfSearch(ofSearch);
- if (mapList.size() > 0){
- for (Map<String, Object> stringObjectMap : mapList) {
- Integer o = (Integer) stringObjectMap.get("id");
- 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));
- int count2 = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
- .eq(UserPointsMerchandise::getPointsMerchandiseId, o)
- .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());
- }
- }
- System.out.println("mapList->"+mapList);
- return mapList;
- }
public int dealTimeStatus(String startTime, String endTime){
LocalDate now = LocalDate.now();
@@ -684,4 +758,342 @@
return mapList;
}
+ @PostMapping("/base/pointMerchars/queryPointMerchaseById")
+ public PointsMerchandise queryPointMerchaseById(@RequestBody Integer id){
+ return pmdsService.getById(id);
+ }
+
+ @PostMapping("/base/pointMerchars/getshopName")
+ public Integer getshopName(@RequestBody Integer id){
+ List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>().eq(PointsMerchandiseStore::getPointsMerchandiseId, id));
+ PointsMerchandiseStore pointsMerchandiseStore = list.get(0);
+ Integer storeId = pointsMerchandiseStore.getStoreId();
+ return storeId;
+ }
+
+
+ @PostMapping("/base/pointMerchars/queryDetailsOfGoods")
+ public GoodsInfoOneVo queryDetailsOfGoods(@RequestBody Integer id){
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ GoodsInfoOneVo infoOneVo = new GoodsInfoOneVo();
+ PointsMerchandise byId = pmdsService.getById(id);
+
+ if (ToolUtil.isNotEmpty(byId)){
+ infoOneVo.setName(byId.getName());
+ infoOneVo.setCover(byId.getCover());
+ infoOneVo.setPics(byId.getProductImages());
+ infoOneVo.setPrice(byId.getPrice());
+ infoOneVo.setExchangeMethod(byId.getRedemptionMethod());
+ switch (byId.getRedemptionMethod()){
+ case 1:
+ infoOneVo.setIntegral(byId.getIntegral());
+ break;
+ case 2:
+ infoOneVo.setIntegral(byId.getIntegral());
+ infoOneVo.setCash(byId.getCash());
+ break;
+ case 3:
+ infoOneVo.setCash(byId.getCash());
+ break;
+ default:
+ break;
+ }
+ switch (byId.getUserPopulation()){
+ case 1:
+ infoOneVo.setUserPopulation("全部用户");
+ break;
+ case 2:
+ infoOneVo.setUserPopulation("年度会员");
+ break;
+ case 3:
+ infoOneVo.setUserPopulation("已有学员用户");
+ break;
+ default:
+ break;
+ }
+ infoOneVo.setQuantityIssued(byId.getQuantityIssued());
+ List<UserPointsMerchandise> list = upmseService.list(new LambdaQueryWrapper<UserPointsMerchandise>()
+ .eq(UserPointsMerchandise::getPointsMerchandiseId,byId.getId()));
+ infoOneVo.setUseScope(byId.getUseScope());
+ switch (byId.getUseScope()){
+ case 1:
+ infoOneVo.setExchangeArea("全国通用");
+ break;
+ case 2:
+ infoOneVo.setExchangeArea("指定城市");
+ break;
+ case 3:
+ infoOneVo.setExchangeArea("指定门店");
+ break;
+ default:
+ break;
+ }
+ infoOneVo.setHasPicked(list.size());
+ infoOneVo.setPickUpQuantity(byId.getPickUpQuantity());
+ infoOneVo.setValidTime(simpleDateFormat.format(byId.getStartTime())+"至"+ simpleDateFormat.format(byId.getEndTime()));
+ infoOneVo.setRedemptionInstructions(byId.getRedemptionInstructions());
+ infoOneVo.setSort(byId.getSort());
+ }
+ return infoOneVo;
+ }
+
+
+ @ResponseBody
+ @PostMapping("/base/pointMerchars/getProvinces")
+ public List<StoreVos> getProvinces(@RequestBody Integer id){
+ List<StoreVos> storeVos = new ArrayList<>();
+ List<PointsMerchandiseCity> list = pmdsCityService.list(new LambdaQueryWrapper<PointsMerchandiseCity>()
+ .eq(PointsMerchandiseCity::getPointsMerchandiseId,id));
+ if (list.size() > 0 ){
+ for (PointsMerchandiseCity pointsMerchandiseCity : list) {
+ StoreVos storeVos1 = new StoreVos();
+ storeVos1.setNum1(pointsMerchandiseCity.getProvince());
+ storeVos1.setNum2(pointsMerchandiseCity.getCity());
+ storeVos.add(storeVos1);
+ }
+ }
+ return storeVos;
+ }
+
+
+ @ResponseBody
+ @PostMapping("/base/pointMerchars/getStoreList")
+ public List<StoreVos> getStoreList(@RequestBody Integer id){
+ List<StoreVos> storeVos = new ArrayList<>();
+ List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
+ .eq("pointsMerchandiseId",id));
+ if (list.size() > 0 ){
+ List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
+ List<Store> stores = stoClient.queryStoreByIds(collect);
+ if (stores.size() > 0 ){
+ for (Store store : stores) {
+ StoreVos storeVos1 = new StoreVos();
+ storeVos1.setNum1(store.getProvince() +"省"+ store.getCity() +"市");
+ storeVos1.setNum2(store.getName());
+ storeVos.add(storeVos1);
+ }
+ }
+ }
+ return storeVos;
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/base/pointMerchars/updateGoodsDetail")
+ public boolean updateGoodsDetail(@RequestBody Map<String, Object> map){
+ try {
+ Integer pointMerchandiseId = (Integer) map.get("pointMerchandiseId");
+ PointsMerchandise byId1 = pmdsService.getById(pointMerchandiseId);
+
+ Integer quantityIssued = (Integer) map.get("quantityIssued");
+ Integer pickUpQuantity = (Integer) map.get("pickUpQuantity");
+ String redemptionInstructions = (String) map.get("redemptionInstructions");
+ String cover = (String) map.get("cover");
+ String productImages = (String) map.get("productImages");
+ Integer sort = (Integer) map.get("sort");
+
+ byId1.setQuantityIssued(quantityIssued);
+ byId1.setPickUpQuantity(pickUpQuantity);
+ byId1.setRedemptionInstructions(redemptionInstructions);
+ if (ToolUtil.isNotEmpty(cover)){
+ byId1.setCover(cover);
+ }
+ if (ToolUtil.isNotEmpty(productImages)){
+ byId1.setProductImages(productImages);
+ }
+ byId1.setSort(sort);
+ pmdsService.updateById(byId1);
+ return true;
+ }catch (Exception e){
+ return false;
+ }
+ }
+
+
+
+ @PostMapping("/base/pointMerchars/add")
+ public Integer add(@RequestBody PointsMerchandise pointsMerchandise){
+ Integer storeId = pointsMerchandise.getShelves();
+ pointsMerchandise.setShelves(2);
+ boolean save = pmdsService.save(pointsMerchandise);
+ if(save && ToolUtil.isNotEmpty(storeId) && pointsMerchandise.getType()==2){
+ PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
+ pointsMerchandiseStore.setPointsMerchandiseId(pointsMerchandise.getId());
+ pointsMerchandiseStore.setStoreId(storeId);
+ save = pmdstoService.save(pointsMerchandiseStore);
+ }
+ if(save && pointsMerchandise.getType()==2 && ToolUtil.isNotEmpty(pointsMerchandise.getProvinceCode())){
+ pmdsService.saveCity(pointsMerchandise.getId(),pointsMerchandise.getProvince(),pointsMerchandise.getProvinceCode(),pointsMerchandise.getCity(),pointsMerchandise.getCityCode());
+ }
+ if(save){
+ return pointsMerchandise.getId();
+ }
+ return null;
+ }
+
+
+
+ @PostMapping("/base/pointMerchars/addOther")
+ public Boolean addOther(@RequestBody String pam){
+ Boolean save =false;
+ String[] split = pam.split("_");
+ for (String s : split[1].split(",")) {
+ PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
+ pointsMerchandiseStore.setPointsMerchandiseId(Integer.valueOf(split[0]));
+ pointsMerchandiseStore.setStoreId(Integer.valueOf(s));
+ save = pmdstoService.save(pointsMerchandiseStore);
+ }
+ return save;
+ }
+
+ @PostMapping("/base/pointMerchars/addCitys")
+ public Boolean addCitys(@RequestBody ArrayList<Map<String, String>> objects){
+ try {
+ for (Map<String, String> object : objects) {
+ pmdsService.saveCity(Integer.valueOf(object.get("id")),object.get("pName"),object.get("pCode"),object.get("cName"),object.get("cCode"));
+ }
+ return true;
+ }catch (Exception e){
+ e.printStackTrace();
+ return false;
+ }
+
+ }
+
+ @ResponseBody
+ @PostMapping("/base/pointMerchars/writeOffGoodsStatus")
+ public boolean writeOffGoodsStatus(@RequestBody Map<String, Object> map){
+ try {
+ String o = (String) map.get("goodsId");
+ Integer managerId = (Integer) map.get("managerId");
+ UserPointsMerchandise byId = upmseService.getOne(new LambdaQueryWrapper<UserPointsMerchandise>()
+ .eq(UserPointsMerchandise::getId,Long.parseLong(o) ));
+ if (byId.getStatus() == 2){
+ return false;
+ }
+ byId.setStatus(2);
+ byId.setVerificationUserId(managerId);
+ byId.setVerificationTime(new Date());
+ upmseService.update(byId,new LambdaQueryWrapper<UserPointsMerchandise>()
+ .eq(UserPointsMerchandise::getUserId,byId.getUserId())
+ .eq(UserPointsMerchandise::getId,byId.getId()));
+ System.out.println(byId);
+ return true;
+ }catch (Exception e){
+ return false;
+ }
+ }
+
+
+
+ @ResponseBody
+ @PostMapping("/base/pointMerchars/getIntegralGoodsListOfSearchAudit")
+ public List<Map<String,Object>> getIntegralGoodsListOfSearchAudit(@RequestBody IntegralGoodsOfSearch ofSearch){
+ System.out.println(ofSearch);
+ List<Map<String, Object>> mapList = pmdsService.queryGoodsListOfSearchAudit(ofSearch);
+ if (mapList.size() > 0){
+ for (Map<String, Object> stringObjectMap : mapList) {
+ Integer o = (Integer) stringObjectMap.get("id");
+ 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));
+ int count2 = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
+ .eq(UserPointsMerchandise::getPointsMerchandiseId, o)
+ .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());
+ }
+ }
+ System.out.println("mapList->"+mapList);
+ return mapList;
+ }
+
+
+ @PostMapping("/base/pointMerchars/updateType")
+ @ResponseBody
+ public Object updateType(@RequestBody String s){
+ String[] split = s.split("_");
+ PointsMerchandise byId = pmdsService.getById(split[0]);
+ byId.setStatus(Integer.valueOf(split[1]));
+ if(Integer.valueOf(split[1])==3){
+
+ byId.setRemark(split[2]);
+ }
+ return pmdsService.updateById(byId);
+
+ }
+
+
+ @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;
+
+
+ }
+
}
--
Gitblit v1.7.1