From 1aa309700fb7e12d85f98bed22a45bdac448ec1c Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期六, 16 九月 2023 11:18:46 +0800
Subject: [PATCH] app 2.0
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 78 ++++----------------------------------
1 files changed, 9 insertions(+), 69 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 faff332..e410aee 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
@@ -142,6 +142,7 @@
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
ProductDetailsVo detailsVo = new ProductDetailsVo();
PointsMerchandise merchandise = pmdsService.getById(detailRequest.getGoodId());
+ detailsVo.setCardType(merchandise.getCardTye());
switch (detailRequest.getGoodsType()){
case 2:
// 课包
@@ -364,8 +365,11 @@
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
PointDetailsVo detailsVo = new PointDetailsVo();
UserPointsMerchandise byId = upmseService.getById(speMercharsId);
+
if (ToolUtil.isNotEmpty(byId)){
PointsMerchandise pmdsServiceById = pmdsService.getById(byId.getPointsMerchandiseId());
+ // 2.0
+ detailsVo.setCardType(pmdsServiceById.getCardTye());
detailsVo.setExchangeType(pmdsServiceById.getRedemptionMethod());
detailsVo.setGoodType(pmdsServiceById.getType());
if (pmdsServiceById.getRedemptionMethod() == 1){
@@ -428,7 +432,8 @@
}
detailsVo.setGoodName(pmdsServiceById.getName());
- detailsVo.setStartTime(simpleDateFormat.format(pmdsServiceById.getStartTime()));
+ // 2.0
+ detailsVo.setStartTime(simpleDateFormat.format(byId.getInsertTime()));
detailsVo.setEndTime(simpleDateFormat.format(pmdsServiceById.getEndTime()));
detailsVo.setOrderTime(simpleDateFormat.format(byId.getInsertTime()));
if (byId.getStatus() == 1){
@@ -474,10 +479,7 @@
@PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
public void updateDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise){
- upmseService.update(merchandise,new LambdaQueryWrapper<UserPointsMerchandise>()
- .eq(UserPointsMerchandise::getUserId,merchandise.getUserId())
- .eq(UserPointsMerchandise::getId,merchandise.getId()));
-
+ upmseService.updateById(merchandise);
}
@PostMapping("/base/pointMerchars/queryUserPointMerchaseByCode")
@@ -527,9 +529,7 @@
if (list.size() > 0 ){
for (UserPointsMerchandise pointsMerchandise : list) {
pointsMerchandise.setState(2);
- upmseService.update(pointsMerchandise,new LambdaQueryWrapper<UserPointsMerchandise>()
- .eq(UserPointsMerchandise::getUserId,pointsMerchandise.getUserId())
- .eq(UserPointsMerchandise::getId,pointsMerchandise.getId()));
+ upmseService.updateById(pointsMerchandise);
}
}
@@ -629,13 +629,10 @@
public PointMercharsVo queryPointMerchaseDetailOfId(@RequestBody Integer pointMercharsId){
PointMercharsVo vo = new PointMercharsVo();
PointsMerchandise byId = pmdsService.getById(pointMercharsId);
- List<UserPointsMerchandise> list = upmseService.list(new LambdaQueryWrapper<UserPointsMerchandise>()
- .eq(UserPointsMerchandise::getPointsMerchandiseId, pointMercharsId));
if (ToolUtil.isNotEmpty(byId)){
vo.setName(byId.getName());
vo.setCover(byId.getCover());
vo.setPics(byId.getProductImages());
- vo.setQuantityHas(list.size());
vo.setQuantityIssued(byId.getQuantityIssued());
vo.setPickUpQuantity(byId.getPickUpQuantity());
vo.setSort(byId.getSort());
@@ -677,7 +674,7 @@
if (list.size() > 0 ){
for (UserPointsMerchandise pointsMerchandise : list) {
Map<String, Object> map = new HashMap<>();
- map.put("id",pointsMerchandise.getId().toString());
+ map.put("id",pointsMerchandise.getId());
map.put("userId",pointsMerchandise.getUserId());
map.put("status", pointsMerchandise.getStatus());
mapList.add(map);
@@ -685,63 +682,6 @@
}
System.out.println(mapList);
return mapList;
- }
-
- @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/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;
- }
}
}
--
Gitblit v1.7.1