From 1eb07ec3e65ae47267becdbe7e7bc95ce40fec52 Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期二, 31 十月 2023 20:25:26 +0800
Subject: [PATCH] 10.31.1
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 74 +++++++++++++++++++++++++++++++-----
1 files changed, 63 insertions(+), 11 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 16ba99f..302410c 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
@@ -89,12 +89,23 @@
* 门票上下架 state=1 上架 state=2 下架
*/
@RequestMapping("/base/pointMerchars/changeState")
- public Object changeState(@RequestBody CoachChangeStateVO dto){
- return pmdsService.changeState(dto);
+ public void changeState(@RequestBody CoachChangeStateVO dto){
+
+
+ pmdsService.changeState(dto);
}
/**
* 门票核销
*/
+
+ @RequestMapping("/base/course/changeState")
+ @ResponseBody
+ public Object changeState(@RequestBody CourseChangeStateDTO dto){
+ return userPointsMerchandiseService.changeState(dto);
+ }
+
+
+
@RequestMapping("/base/pointMerchars/writeOff")
public Object writeOff(@RequestBody WriteOffDTO dto){
UserPointsMerchandise byId = userPointsMerchandiseService.getById(dto.getId());
@@ -126,6 +137,27 @@
result.add(map);
}
}
+ }else if(ofSearch.getObjType()==2){
+ for (Map<String, Object> map : result1) {
+ // 拿到当前运营商下的门店的门票
+ List<PointsMerchandiseStore> id = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>().in("storeId",ofSearch.getStoreIds()));
+ // 拿到积分商品id集合
+ List<Integer> collect = id.stream().map(PointsMerchandiseStore::getPointsMerchandiseId).collect(Collectors.toList());
+ if(collect.size()==0){
+ collect.add(-1);
+ }
+ Integer temp =(Integer)map.get("id");
+ if (collect.contains(temp)){
+ if(id.size()>1){
+ map.put("size",1);
+ }else {
+ map.put("size",0);
+ }
+ result.add(map);
+ }
+ }
+ } else {
+ result=result1;
}
if (result.size() > 0){
for (Map<String, Object> stringObjectMap : result) {
@@ -459,13 +491,19 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
ProductDetailsVo detailsVo = new ProductDetailsVo();
PointsMerchandise merchandise = pmdsService.getById(detailRequest.getGoodId());
- detailsVo.setCardType(merchandise.getCardType());
+
+
+
+ if (merchandise!=null) {
+ detailsVo.setCardType(merchandise.getCardType());
+ }
switch (detailRequest.getGoodsType()){
case 2:
// 课包
CoursePackage coursePackage = cpClient.queryCoursePackageById(merchandise.getCoursePackageId());
- detailsVo.setGoodId(coursePackage.getId());
+// detailsVo.setGoodId(coursePackage.getId());
+ detailsVo.setGoodId(merchandise.getId());
List<String> list1 = new ArrayList<>();
list1.add(coursePackage.getCoverDrawing());
list1.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ",")));
@@ -599,10 +637,10 @@
});
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));
+// int couponNums = upmseService.count(new QueryWrapper<UserPointsMerchandise>()
+// .eq("pointsMerchandiseId",merchandise.getId() ));
+ detailsVo.setRedeemedNum(coupon.getPickUpQuantity());
+ detailsVo.setResidueNum(Math.max(coupon.getQuantityIssued() - coupon.getPickUpQuantity(), 0));
detailsVo.setPerLimit(coupon.getPickUpQuantity());
detailsVo.setExchangeType(coupon.getRedemptionMethod());
if (coupon.getRedemptionMethod() == 1){
@@ -674,6 +712,7 @@
if(merchandise.getUseScope()==1){
sids.add(0);
detailsResponse.setSid(sids);
+ detailsResponse.setRid(new ArrayList<>());
}else if(merchandise.getUseScope()==2){
// 指定城市
List<PointsMerchandiseCity> list = pmdsCityService.list(new LambdaQueryWrapper<PointsMerchandiseCity>().eq(PointsMerchandiseCity::getPointsMerchandiseId, merchandise.getId()));
@@ -683,13 +722,23 @@
}
List<Integer> storeIds = stoClient.queryStoreIdByCityCode(collect);
detailsResponse.setSid(storeIds);
+ if(storeIds.size()>0){
+ // 获取rid
+ List<Integer> rid= stoClient.querySiteIdById(storeIds);
+ detailsResponse.setRid(rid);
+ }
+
}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);
-
+ if(collect.size()>0){
+ // 获取rid
+ List<Integer> rid= stoClient.querySiteIdById(collect);
+ detailsResponse.setRid(rid);
+ }
}
}
@@ -827,6 +876,7 @@
upmseService.updateById(merchandise);
}
+ @ResponseBody
@PostMapping("/base/pointMerchars/queryUserPointMerchaseByCode")
public List<UserPointsMerchandise> queryUserPointMerchaseByCode(@RequestBody String code){
return upmseService.list(new QueryWrapper<UserPointsMerchandise>()
@@ -1148,7 +1198,9 @@
try {
Integer pointMerchandiseId = (Integer) map.get("pointMerchandiseId");
PointsMerchandise byId1 = pmdsService.getById(pointMerchandiseId);
-
+ if(Integer.valueOf(map.get("type").toString())!=1){
+ byId1.setStatus(2);
+ }
Integer quantityIssued = (Integer) map.get("quantityIssued");
Integer pickUpQuantity = (Integer) map.get("pickUpQuantity");
String redemptionInstructions = (String) map.get("redemptionInstructions");
@@ -1174,7 +1226,6 @@
}
-
@PostMapping("/base/pointMerchars/add")
public Integer add(@RequestBody PointsMerchandise pointsMerchandise){
Integer storeId = pointsMerchandise.getShelves();
@@ -1197,6 +1248,7 @@
+
@PostMapping("/base/pointMerchars/addOther")
public Boolean addOther(@RequestBody String pam){
Boolean save =false;
--
Gitblit v1.7.1