From a992ef30f108338b5318c31aaf49aeb98d9da77e Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期二, 24 十月 2023 20:22:32 +0800
Subject: [PATCH] 运营商权限
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 421 ++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 387 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 ebb83f8..ac2c654 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
@@ -12,7 +12,11 @@
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;
@@ -78,6 +82,92 @@
@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")
@@ -91,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());
@@ -123,12 +213,12 @@
list = pmdsService.list(new QueryWrapper<PointsMerchandise>()
.eq("state", 1)
- .eq("shelves",1));
+ .eq("shelves",1).le("startTime",new Date()).ge("endTime",new Date()));
if (list.size() > 0 ){
Iterator<PointsMerchandise> iterator = list.iterator();
while (iterator.hasNext()) {
PointsMerchandise merchandise = iterator.next();
- if (merchandise.getUseScope() == 2 && (!Objects.equals(merchandise.getCityCode(), cityCode) && !Objects.equals(merchandise.getProvinceCode(), provinceCode))) {
+ if (merchandise.getUseScope() == 2 && (!cityCode.equals(merchandise.getCityCode()) || !provinceCode.equals(merchandise.getProvinceCode()))) {
iterator.remove(); // 移除符合条件的商品
}
}
@@ -143,7 +233,191 @@
.eq("pointsMerchandiseId",goodId));
}
+ @PostMapping("/base/pointMerchars/getGoodDetailsWithIdOne")
+ public ProductDetailsVo getGoodDetailsWithIdOne(@RequestBody Integer id){
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ ProductDetailsVo detailsVo = new ProductDetailsVo();
+ PointsMerchandise merchandise = pmdsService.getById(id);
+ detailsVo.setCardType(merchandise.getCardType());
+ switch (merchandise.getType()){
+ case 2:
+// 课包
+ CoursePackage coursePackage = cpClient.queryCoursePackageById(merchandise.getCoursePackageId());
+ detailsVo.setGoodId(coursePackage.getId());
+ List<String> list1 = new ArrayList<>();
+ list1.add(coursePackage.getCoverDrawing());
+ list1.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ",")));
+ detailsVo.setPics(list1);
+ Collections.sort(detailsVo.getPics(), (s1, s2) -> {
+ if (s1.equals(coursePackage.getCoverDrawing())) {
+ return -1; // s1排在前面
+ } else if (s2.equals(coursePackage.getCoverDrawing())) {
+ return 1; // s2排在前面
+ } else {
+ return 0; // 保持原顺序
+ }
+ });
+ detailsVo.setGoodName(coursePackage.getName());
+ detailsVo.setBelongsScope(merchandise.getUserPopulation());
+ int coursePackageNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
+ .eq("pointsMerchandiseId",merchandise.getId() ));
+ detailsVo.setRedeemedNum(coursePackageNums);
+ detailsVo.setResidueNum(Math.max(merchandise.getQuantityIssued() - coursePackageNums, 0));
+ detailsVo.setPerLimit(merchandise.getPickUpQuantity());
+ if (merchandise.getRedemptionMethod() == 1){
+ detailsVo.setExchangeType(1);
+ detailsVo.setIntegral(merchandise.getIntegral());
+ }else {
+ detailsVo.setExchangeType(2);
+ detailsVo.setIntegral(merchandise.getIntegral());
+ detailsVo.setCash(merchandise.getCash());
+ }
+ detailsVo.setCost(merchandise.getPrice());
+ if (merchandise.getUseScope() == 1){
+ detailsVo.setExchangeAddrType(1);
+ detailsVo.setBelongs("全国通用");
+ }else if (merchandise.getUseScope() == 2){
+ detailsVo.setExchangeAddrType(2);
+ detailsVo.setBelongs(merchandise.getProvince()+"|"+merchandise.getCity() + "用户可用");
+ }else {
+ detailsVo.setExchangeAddrType(3);
+ List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
+ .eq("pointsMerchandiseId",merchandise.getId() ));
+ PointsMerchandiseStore pointsMerchandiseStore = list.get(0);
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(pointsMerchandiseStore.getStoreId());
+ detailsVo.setBelongs(courseOfStore.getStoreName()+"可用");
+ }
+ List<CoursePackagePaymentConfig> courseConfigList = cpcfigClient.getCourseConfigList(coursePackage.getId());
+
+ for (CoursePackagePaymentConfig coursePackagePaymentConfig : courseConfigList) {
+ if (Objects.equals(coursePackagePaymentConfig.getId(), merchandise.getCoursePackageConfigId())){
+ detailsVo.setCourseHours(coursePackagePaymentConfig.getClassHours());
+ break;
+ }
+ }
+ detailsVo.setStartTime(format.format(merchandise.getStartTime()));
+ detailsVo.setEndTime(format.format(merchandise.getEndTime()));
+
+ detailsVo.setContents(merchandise.getRedemptionInstructions());
+ detailsVo.setGoodType(merchandise.getType());
+
+ break;
+ case 1:
+ case 3:
+
+ detailsVo.setGoodId(merchandise.getId());
+ List<String> list2 = new ArrayList<>();
+ String cover = merchandise.getCover();
+ list2.addAll(Arrays.asList(StrUtils.splitStr2StrArr(merchandise.getProductImages(), ",")));
+ detailsVo.setPics(list2);
+ Collections.sort(detailsVo.getPics(), (s1, s2) -> {
+ if (s1.equals(merchandise.getCover())) {
+ return -1; // s1排在前面
+ } else if (s2.equals(merchandise.getCover())) {
+ return 1; // s2排在前面
+ } else {
+ return 0; // 保持原顺序
+ }
+ });
+ detailsVo.setPics(list2);
+ detailsVo.setGoodName(merchandise.getName());
+ detailsVo.setBelongsScope(merchandise.getUserPopulation());
+ int count = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
+ .eq("pointsMerchandiseId",merchandise.getId() ));
+ detailsVo.setRedeemedNum(count);
+ detailsVo.setResidueNum(Math.max(merchandise.getQuantityIssued() - count, 0));
+ detailsVo.setPerLimit(merchandise.getPickUpQuantity());
+ detailsVo.setExchangeType(merchandise.getRedemptionMethod());
+ if (merchandise.getRedemptionMethod() == 1){
+ detailsVo.setIntegral(merchandise.getIntegral());
+ }else {
+ detailsVo.setIntegral(merchandise.getIntegral());
+ detailsVo.setCash(merchandise.getCash());
+ }
+ detailsVo.setCost(merchandise.getPrice());
+ if (merchandise.getUseScope() == 1){
+ detailsVo.setExchangeAddrType(1);
+ detailsVo.setBelongs("全国通用");
+ }else if (merchandise.getUseScope() == 2){
+ detailsVo.setExchangeAddrType(2);
+ detailsVo.setBelongs(merchandise.getProvince()+"|"+merchandise.getCity() + "用户可用");
+ }else {
+ detailsVo.setExchangeAddrType(3);
+ List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
+ .eq("pointsMerchandiseId",merchandise.getId() ));
+ PointsMerchandiseStore pointsMerchandiseStore = list.get(0);
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(pointsMerchandiseStore.getStoreId());
+ detailsVo.setBelongs(courseOfStore.getStoreName()+"可用");
+ }
+
+ detailsVo.setStartTime(format.format(merchandise.getStartTime()));
+ detailsVo.setEndTime(format.format(merchandise.getEndTime()));
+
+ detailsVo.setContents(merchandise.getRedemptionInstructions());
+ detailsVo.setGoodType(merchandise.getType());
+ break;
+ case 4:
+// 优惠券
+ Coupon coupon = iCouponService.getById(id);
+ detailsVo.setGoodId(coupon.getId());
+ List<String> list3 = new ArrayList<>();
+ list3.add(ToolUtil.isEmpty(coupon.getCover()) ? "" : coupon.getCover());
+ if (ToolUtil.isNotEmpty(coupon.getProductImages())){
+ list3.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coupon.getProductImages(), ",")));
+ }
+ detailsVo.setPics(list3);
+ Collections.sort(detailsVo.getPics(), (s1, s2) -> {
+ if (s1.equals(coupon.getCover())) {
+ return -1; // s1排在前面
+ } else if (s2.equals(coupon.getCover())) {
+ return 1; // s2排在前面
+ } else {
+ return 0; // 保持原顺序
+ }
+ });
+ detailsVo.setGoodName(coupon.getName());
+ detailsVo.setBelongsScope(coupon.getUserPopulation());
+ int couponNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
+ .eq("pointsMerchandiseId",merchandise.getId() ));
+ detailsVo.setRedeemedNum(couponNums);
+ detailsVo.setResidueNum(Math.max(coupon.getQuantityIssued() - couponNums, 0));
+ detailsVo.setPerLimit(coupon.getPickUpQuantity());
+ detailsVo.setExchangeType(coupon.getRedemptionMethod());
+ if (coupon.getRedemptionMethod() == 1){
+ detailsVo.setIntegral(coupon.getIntegral().intValue());
+ }else {
+ detailsVo.setIntegral(coupon.getIntegral().intValue());
+ detailsVo.setCash(coupon.getCash());
+ }
+ if (coupon.getUseScope() == 1){
+ detailsVo.setExchangeAddrType(1);
+ detailsVo.setBelongs("全国通用");
+ }else if (coupon.getUseScope() == 2){
+ detailsVo.setExchangeAddrType(2);
+ List<CouponCity> list = ccityService.list(new LambdaQueryWrapper<CouponCity>()
+ .eq(CouponCity::getCouponId, coupon.getId()));
+ if (list.size() > 0){
+ detailsVo.setBelongs(list.get(0).getProvince()+"|"+list.get(0).getCity() + "用户可用");
+ }
+ }else {
+ detailsVo.setExchangeAddrType(3);
+ List<CouponStore> list = cstoreService.list(new QueryWrapper<CouponStore>()
+ .eq("couponId",coupon.getId() ));
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(list.get(0).getStoreId());
+ detailsVo.setBelongs(courseOfStore.getStoreName()+"可用");
+ }
+ detailsVo.setStartTime(format.format(coupon.getStartTime()));
+ detailsVo.setEndTime(format.format(coupon.getEndTime()));
+
+ detailsVo.setContents(coupon.getIllustrate());
+ detailsVo.setGoodType(4);
+ break;
+ default:
+ break;
+ }
+ return detailsVo;
+ }
@PostMapping("/base/pointMerchars/getGoodDetails")
public ProductDetailsVo getGoodDetailsWithId(@RequestBody ProductDetailRequest detailRequest){
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
@@ -220,7 +494,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) -> {
@@ -358,6 +631,32 @@
detailsResponse.setEndTime(simpleDateFormat.format(merchandise.getEndTime()));
detailsResponse.setUseStatus(pointsMerchandise.getStatus() == 1 ? 2 : 1);
detailsResponse.setGoodType(merchandise.getType());
+ if(merchandise.getType()==3){
+ detailsResponse.setCardType(merchandise.getCardType());
+ List<Integer> sids = new ArrayList<>();
+ detailsResponse.setUserId(appUserId);
+ if(merchandise.getUseScope()==1){
+ sids.add(0);
+ detailsResponse.setSid(sids);
+ }else if(merchandise.getUseScope()==2){
+ // 指定城市
+ List<PointsMerchandiseCity> list = pmdsCityService.list(new LambdaQueryWrapper<PointsMerchandiseCity>().eq(PointsMerchandiseCity::getPointsMerchandiseId, merchandise.getId()));
+ List<String> collect = list.stream().map(PointsMerchandiseCity::getCityCode).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add("-1");
+ }
+ List<Integer> storeIds = stoClient.queryStoreIdByCityCode(collect);
+ detailsResponse.setSid(storeIds);
+
+ }else if(merchandise.getUseScope()==3){
+ // 指定门店
+ List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>().eq(PointsMerchandiseStore::getPointsMerchandiseId, merchandise.getId()));
+ List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
+ detailsResponse.setSid(collect);
+
+
+ }
+ }
responses.add(detailsResponse);
}
detailsVo.setDetailsResponses(responses);
@@ -522,7 +821,15 @@
@PostMapping("/base/pointMerchars/queryUserHasGoodsNums")
public int queryUserHasGoodsNums(@RequestBody AppUserGoodResp goodResp){
int count = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
- .eq(UserPointsMerchandise::getUserId,goodResp.getGoodId())
+ .eq(UserPointsMerchandise::getUserId,goodResp.getAppUserId())
+ .eq(UserPointsMerchandise::getPointsMerchandiseId,goodResp.getGoodId()));
+ System.out.println(count);
+ return count;
+ }
+ @ResponseBody
+ @PostMapping("/base/pointMerchars/queryUserHasGoodsNums1")
+ public int queryUserHasGoodsNums1(@RequestBody AppUserGoodResp goodResp){
+ int count = upmseService.count(new LambdaQueryWrapper<UserPointsMerchandise>()
.eq(UserPointsMerchandise::getPointsMerchandiseId,goodResp.getGoodId()));
System.out.println(count);
return count;
@@ -549,34 +856,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();
@@ -651,6 +930,8 @@
vo.setSort(byId.getSort());
vo.setContent(byId.getRedemptionInstructions());
}
+ int count = userPointsMerchandiseService.count(new LambdaQueryWrapper<UserPointsMerchandise>().eq(UserPointsMerchandise::getPointsMerchandiseId, pointMercharsId));
+ vo.setNum(count);
return vo;
}
@@ -808,7 +1089,14 @@
for (Store store : stores) {
StoreVos storeVos1 = new StoreVos();
storeVos1.setNum1(store.getProvince() +"省"+ store.getCity() +"市");
- storeVos1.setNum2(store.getName());
+ if(store.getOperatorId()==0){
+ storeVos1.setNum2("平台");
+ }else {
+
+ storeVos1.setNum2(store.getOName());
+ }
+ storeVos1.setNum3(store.getName());
+ storeVos1.setNum4(store.getIds());
storeVos.add(storeVos1);
}
}
@@ -970,4 +1258,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;
+
+
+ }
+
}
--
Gitblit v1.7.1