From f6ba3e15355e22767e69f8fc14ae22523f8db8dc Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 22 十一月 2023 19:33:58 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/PlayPai
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 127 +++++++++++++++++++++++++++++++----------
1 files changed, 95 insertions(+), 32 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 3441dd2..9394121 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
@@ -13,6 +13,7 @@
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.feignclient.other.model.StoreInfoDto;
import com.dsh.activity.feignclient.other.model.TOperatorCity;
import com.dsh.activity.model.CoachChangeStateVO;
import com.dsh.activity.model.PointMerchandiseIncomeVo;
@@ -27,6 +28,7 @@
import com.dsh.activity.util.StrUtils;
import com.dsh.activity.util.TokenUtil;
import com.dsh.activity.util.ToolUtil;
+import io.swagger.models.auth.In;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -279,23 +281,39 @@
@ResponseBody
@PostMapping("/base/pointMerchars/convertGoods")
- public List<IntegralCommodity> getConvertibleGoods(){
+ public List<IntegralCommodity> getConvertibleGoods(@RequestBody Location location) throws Exception {
List<IntegralCommodity> commodity = new ArrayList<>();
- List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
- .eq("state",1)
- .eq("shelves",1)
- .gt("endTime",new Date()));
- if (merchandises.size() > 0){
- for (PointsMerchandise merchandise : merchandises) {
- IntegralCommodity integralCommodity = new IntegralCommodity();
- integralCommodity.setCommodityId(merchandise.getId());
- integralCommodity.setCommodityImg(merchandise.getCover());
- integralCommodity.setCommodityName(merchandise.getName());
- integralCommodity.setCommodityPrice(merchandise.getPrice());
- integralCommodity.setGoodsType(merchandise.getType());
- commodity.add(integralCommodity);
- }
+
+ Map<String, String> geocode = gdMapGeocodingUtil.geocode(location.getLon(), location.getLat());
+ String provinceCode = geocode.get("provinceCode");
+ String cityCode = geocode.get("cityCode");
+
+
+ List<PointsMerchandiseCity> cityCode1 = pmdsCityService.list(new QueryWrapper<PointsMerchandiseCity>().eq("cityCode", cityCode));
+ List<Integer> cIds = new ArrayList<>();
+ for (PointsMerchandiseCity pointsMerchandiseCity : cityCode1) {
+ cIds.add(pointsMerchandiseCity.getPointsMerchandiseId());
}
+
+// if (cIds.size()>0) {
+
+ List<PointsMerchandise> merchandises = pmdsService.list(new QueryWrapper<PointsMerchandise>()
+ .eq("state", 1)
+ .eq("shelves", 1)
+ .gt("endTime", new Date()));
+ if (merchandises.size() > 0){
+ for (PointsMerchandise merchandise : merchandises) {
+ IntegralCommodity integralCommodity = new IntegralCommodity();
+ integralCommodity.setCommodityId(merchandise.getId());
+ integralCommodity.setCommodityImg(merchandise.getCover());
+ integralCommodity.setCommodityName(merchandise.getName());
+ integralCommodity.setCommodityPrice(merchandise.getPrice());
+ integralCommodity.setGoodsType(merchandise.getType());
+ commodity.add(integralCommodity);
+ }
+// }
+ }
+
System.out.println(commodity);
return commodity;
}
@@ -566,10 +584,13 @@
// 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(), ",")));
- detailsVo.setPics(list1);
+// List<String> list1 = new ArrayList<>();
+// list1.add(coursePackage.getCoverDrawing());
+// list1.addAll(Arrays.asList(StrUtils.splitStr2StrArr(coursePackage.getDetailDrawing(), ",")));
+
+ String productImages = merchandise.getProductImages();
+ String[] list1 = productImages.split(",");
+ detailsVo.setPics(Arrays.asList(list1));
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
if (s1.equals(coursePackage.getCoverDrawing())) {
return -1; // s1排在前面
@@ -759,12 +780,20 @@
List<ExchangeDetailsResponse> responses = new ArrayList<>();
SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
List<UserPointsMerchandise> pointsMerchandises = upmseService.list(new QueryWrapper<UserPointsMerchandise>()
- .eq("userId",appUserId ));
+ .eq("userId",appUserId ).eq("payStatus",2));
- List<UserCoupon> userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId));
-
-
+ List<Coupon> list1 = couponService.list();
+ List<Integer> ids = new ArrayList<>();
+ for (Coupon coupon : list1) {
+ if (coupon.getDistributionMethod()==1) {
+ ids.add(coupon.getId());
+ }
+ }
+ List<UserCoupon> userCoupons = new ArrayList<>();
+ if (ids.size()>0) {
+ userCoupons = userCouponService.list(new QueryWrapper<UserCoupon>().eq("userId", appUserId).in("couponId", ids));
+ }
if (pointsMerchandises.size() > 0 ){
for (UserPointsMerchandise pointsMerchandise : pointsMerchandises) {
PointsMerchandise merchandise = pmdsService.getById(pointsMerchandise.getPointsMerchandiseId());
@@ -852,10 +881,10 @@
// Print the result
if (isSameDate) {
-
} else {
System.out.println("The two dates do not have the same date.");
detailsResponse.setUseStatus(3);
+
}
@@ -875,7 +904,7 @@
detailsResponse.setUseStatus(3);
}
- } else if (merchandise.getCardType()==3) {
+ } else if (merchandise.getCardType()==3){
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
Calendar calendar = Calendar.getInstance();
calendar.setTime(pointsMerchandise.getInsertTime());
@@ -918,8 +947,9 @@
if (userCoupons.size()>0){
for (UserCoupon userCoupon : userCoupons) {
+
Coupon c = couponService.getById(userCoupon.getCouponId());
- if (c==null){
+ if (c==null|| c.getRedemptionMethod()==null){
continue;
}
@@ -951,17 +981,23 @@
}
+@Autowired
+private PointsMerchandiseStoreService storeService;
+
@ResponseBody
@PostMapping("/base/pointMerchars/getSpecificsOfGoods")
public PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId){
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
PointDetailsVo detailsVo = new PointDetailsVo();
UserPointsMerchandise byId = upmseService.getById(speMercharsId);
+
+ List<PointsMerchandiseStore> stores = storeService.list(new QueryWrapper<PointsMerchandiseStore>().eq("pointsMerchandiseId", byId.getPointsMerchandiseId()));
if (ToolUtil.isNotEmpty(byId)){
PointsMerchandise pmdsServiceById = pmdsService.getById(byId.getPointsMerchandiseId());
// 2.0
detailsVo.setCardType(pmdsServiceById.getCardType());
+ detailsVo.setExchangeAddrType(pmdsServiceById.getUseScope());
detailsVo.setExchangeType(pmdsServiceById.getRedemptionMethod());
detailsVo.setGoodType(pmdsServiceById.getType());
if (pmdsServiceById.getRedemptionMethod() == 1){
@@ -976,6 +1012,22 @@
case 3:
List<String> list10 = Arrays.asList(StrUtils.splitStr2StrArr(pmdsServiceById.getProductImages(), ","));
ArrayList<String> list2 = new ArrayList<>(list10);
+
+
+ SimpleDateFormat dateFormat5 = new SimpleDateFormat("yyyy-MM-dd");
+
+
+ for (PointsMerchandiseStore store : stores) {
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(store.getStoreId());
+ detailsVo.setBelongs(courseOfStore.getStoreName());
+ }
+
+ String format = dateFormat5.format(byId.getInsertTime());
+ detailsVo.setOrderTime(format);
+
+
+
+
list2.add(pmdsServiceById.getCover());
detailsVo.setPics(list2);
Collections.sort(detailsVo.getPics(), (s1, s2) -> {
@@ -1024,6 +1076,9 @@
} else if (pmdsServiceById.getCardType()==2) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+
+
Calendar calendar = Calendar.getInstance();
calendar.setTime(byId.getInsertTime());
calendar.add(Calendar.DAY_OF_MONTH, 31);
@@ -1040,6 +1095,9 @@
} else if (pmdsServiceById.getCardType()==3) {
SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd");
+
+
+
Calendar calendar = Calendar.getInstance();
calendar.setTime(byId.getInsertTime());
calendar.add(Calendar.DAY_OF_MONTH, 93);
@@ -1128,8 +1186,10 @@
}else {
detailsVo.setUseType(1);
detailsVo.setWriteOffTime(simpleDateFormat.format(byId.getVerificationTime()));
- StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getVerifiStoreId());
- detailsVo.setWriteOffName(courseOfStore.getStoreName());
+ if (byId.getStoreId()!=null) {
+ StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
+ detailsVo.setWriteOffName(courseOfStore.getStoreName());
+ }
}
switch (pmdsServiceById.getUseScope()){
case 1:
@@ -1139,8 +1199,9 @@
detailsVo.setBelongs(pmdsServiceById.getProvince()+pmdsServiceById.getCity());
break;
case 3:
- StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
- detailsVo.setBelongs(courseOfStore.getStoreName()+" "+courseOfStore.getStoreAddr());
+// StoreDetailOfCourse courseOfStore = stoClient.getCourseOfStore(byId.getStoreId());
+// detailsVo.setBelongs(courseOfStore.getStoreName()+" "+courseOfStore.getStoreAddr());
+// detailsVo.setBelongs("---------------");
break;
default:
break;
@@ -1227,7 +1288,9 @@
@PostMapping("/base/pointMerchars/updateDetailsUserPointMercase")
- public void updateDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise){
+ public void updateDetailsUserPointMercase(@RequestBody UserPointsMerchandise merchandise){
+ merchandise.setUserId(null);
+ merchandise.setPointsMerchandiseId(null);
upmseService.updateById(merchandise);
}
--
Gitblit v1.7.1