From 631a5aa09e0147ca81fffcb1434e57b1cd1ba6f6 Mon Sep 17 00:00:00 2001
From: lisy <linlangsur163@163.com>
Date: 星期三, 09 八月 2023 09:34:53 +0800
Subject: [PATCH] app端口:积分变动记录增加变动类型字段，代码同步更新；积分兑换操作的数量校验功能完善
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java | 50 +++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 41 insertions(+), 9 deletions(-)
diff --git a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
index ad22b06..55f41f0 100644
--- a/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
+++ b/cloud-server-activity/src/main/java/com/dsh/activity/controller/CouponController.java
@@ -14,7 +14,9 @@
import com.dsh.activity.feignclient.account.model.TStoreStaff;
import com.dsh.activity.feignclient.model.CouponExamineListSearch;
import com.dsh.activity.feignclient.model.CouponListOfSearch;
+import com.dsh.activity.feignclient.other.RegionClient;
import com.dsh.activity.feignclient.other.StoreClient;
+import com.dsh.activity.feignclient.other.model.CityDataAndProvinceDataVo;
import com.dsh.activity.feignclient.other.model.Store;
import com.dsh.activity.model.CouponListVo;
import com.dsh.activity.model.request.CommodityRequest;
@@ -70,6 +72,10 @@
@Resource
private StoreClient stoClient;
+
+
+ @Resource
+ private RegionClient regionClient;
@Resource
private CouponStoreService couStoreService;
@@ -266,14 +272,15 @@
JSONObject jsonObject = JSON.parseObject(coupon.getContent());
switch (coupon.getType()){
case 1:
- couponInfo.put("num1",jsonObject.getDouble("num1"));
- couponInfo.put("num2",jsonObject.getDouble("num2"));
+// {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
+ couponInfo.put("num1",jsonObject.getDouble("conditionalAmount"));
+ couponInfo.put("num2",jsonObject.getDouble("deductionAmount"));
break;
case 2:
- couponInfo.put("num1",jsonObject.getDouble("num1"));
+ couponInfo.put("num1",jsonObject.getDouble("conditionalAmount"));
break;
case 3:
- couponInfo.put("num1",jsonObject.getString("num1"));
+ couponInfo.put("num1",jsonObject.getString("experienceName"));
break;
default:
break;
@@ -378,17 +385,18 @@
coupon.setType(dataVo.getPrescription());
HashMap<String, Object> stringObjectHashMap = new HashMap<>();
switch (dataVo.getPrescription()){
+// {"conditionalAmount":50,"deductionAmount":10,"experienceName":""}
case 1:
- stringObjectHashMap.put("num1",dataVo.getCondition());
- stringObjectHashMap.put("num2",dataVo.getSubtraction());
+ stringObjectHashMap.put("conditionalAmount",dataVo.getCondition());
+ stringObjectHashMap.put("deductionAmount",dataVo.getSubtraction());
coupon.setContent(stringObjectHashMap.toString());
break;
case 2:
- stringObjectHashMap.put("num1",dataVo.getDiscount());
+ stringObjectHashMap.put("conditionalAmount",dataVo.getDiscount());
coupon.setContent(stringObjectHashMap.toString());
break;
case 3:
- stringObjectHashMap.put("num1",dataVo.getExperience());
+ stringObjectHashMap.put("experienceName",dataVo.getExperience());
coupon.setContent(stringObjectHashMap.toString());
break;
default:
@@ -423,7 +431,31 @@
if (dataVo.getUserType() == 1){
coupon.setCityManagerId(dataVo.getCityManagerId());
}
- return couponService.save(coupon);
+ boolean save = couponService.save(coupon);
+ if (save){
+ if (dataVo.getCompany() == 2){
+ for (Integer storeId : dataVo.getStoreIds()) {
+ CouponStore couponStore = new CouponStore();
+ couponStore.setCouponId(coupon.getId());
+ couponStore.setStoreId(storeId);
+ couStoreService.save(couponStore);
+ }
+ }
+ List<Integer> cityIds = dataVo.getCityIds();
+ if (dataVo.getCompany() == 3 && cityIds.size() > 0 ){
+ List<CityDataAndProvinceDataVo> cityAndProvince = regionClient.getCityAndProvince(cityIds);
+ for (CityDataAndProvinceDataVo cityId : cityAndProvince) {
+ CouponCity couponCity = new CouponCity();
+ couponCity.setCouponId(coupon.getId());
+ couponCity.setCityCode(cityId.getCityCode());
+ couponCity.setCity(cityId.getCityName());
+ couponCity.setProvinceCode(cityId.getProvinceCode());
+ couponCity.setProvince(cityId.getProvinceName());
+ cityService.save(couponCity);
+ }
+ }
+ }
+ return true;
}catch (Exception e){
return false;
}
--
Gitblit v1.7.1