From fd658508f4470f0c479b2a36738b0f50481cbbe9 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期六, 16 九月 2023 10:59:09 +0800
Subject: [PATCH] 后台代码
---
cloud-server-activity/src/main/java/com/dsh/activity/controller/PointMercharsController.java | 248 -------------------------------------------------
1 files changed, 3 insertions(+), 245 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 b9699bb..b176c57 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
@@ -10,12 +10,9 @@
import com.dsh.activity.feignclient.course.model.CoursePackagePaymentConfig;
import com.dsh.activity.feignclient.model.*;
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.PointMerchandiseVo;
import com.dsh.activity.model.request.*;
-import com.dsh.activity.model.response.GoodsInfoOneVo;
-import com.dsh.activity.model.response.StoreVos;
import com.dsh.activity.service.*;
import com.dsh.activity.util.GDMapGeocodingUtil;
import com.dsh.activity.util.StrUtils;
@@ -73,9 +70,6 @@
@Resource
private CouponCityService ccityService;
-
- @Resource
- private PointsMerchandiseCityService pmdsCityService;
@ResponseBody
@@ -480,10 +474,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")
@@ -533,9 +524,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);
}
}
@@ -635,13 +624,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());
@@ -683,7 +669,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);
@@ -691,234 +677,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;
- }
- }
-
-
- @PostMapping("/base/pointMerchars/queryDetailsOfGoods")
- public GoodsInfoOneVo queryDetailsOfGoods(@RequestBody Integer id){
- SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
- GoodsInfoOneVo infoOneVo = new GoodsInfoOneVo();
- PointsMerchandise byId = pmdsService.getById(id);
-
- if (ToolUtil.isNotEmpty(byId)){
- infoOneVo.setName(byId.getName());
- infoOneVo.setCover(byId.getCover());
- infoOneVo.setPics(byId.getProductImages());
- infoOneVo.setPrice(byId.getPrice());
- infoOneVo.setExchangeMethod(byId.getRedemptionMethod());
- switch (byId.getRedemptionMethod()){
- case 1:
- infoOneVo.setIntegral(byId.getIntegral());
- break;
- case 2:
- infoOneVo.setIntegral(byId.getIntegral());
- infoOneVo.setCash(byId.getCash());
- break;
- case 3:
- infoOneVo.setCash(byId.getCash());
- break;
- default:
- break;
- }
- switch (byId.getUserPopulation()){
- case 1:
- infoOneVo.setUserPopulation("全部用户");
- break;
- case 2:
- infoOneVo.setUserPopulation("年度会员");
- break;
- case 3:
- infoOneVo.setUserPopulation("已有学员用户");
- break;
- default:
- break;
- }
- infoOneVo.setQuantityIssued(byId.getQuantityIssued());
- List<UserPointsMerchandise> list = upmseService.list(new LambdaQueryWrapper<UserPointsMerchandise>()
- .eq(UserPointsMerchandise::getPointsMerchandiseId,byId.getId()));
- infoOneVo.setUseScope(byId.getUseScope());
- switch (byId.getUseScope()){
- case 1:
- infoOneVo.setExchangeArea("全国通用");
- break;
- case 2:
- infoOneVo.setExchangeArea("指定城市");
- break;
- case 3:
- infoOneVo.setExchangeArea("指定门店");
- break;
- default:
- break;
- }
- infoOneVo.setHasPicked(list.size());
- infoOneVo.setPickUpQuantity(byId.getPickUpQuantity());
- infoOneVo.setValidTime(simpleDateFormat.format(byId.getStartTime())+"至"+ simpleDateFormat.format(byId.getEndTime()));
- infoOneVo.setRedemptionInstructions(byId.getRedemptionInstructions());
- infoOneVo.setSort(byId.getSort());
- }
- return infoOneVo;
- }
-
-
-
- @ResponseBody
- @PostMapping("/base/pointMerchars/getStoreList")
- public List<StoreVos> getStoreList(@RequestBody Integer id){
- List<StoreVos> storeVos = new ArrayList<>();
- List<PointsMerchandiseStore> list = pmdstoService.list(new QueryWrapper<PointsMerchandiseStore>()
- .eq("pointsMerchandiseId",id));
- if (list.size() > 0 ){
- List<Integer> collect = list.stream().map(PointsMerchandiseStore::getStoreId).collect(Collectors.toList());
- List<Store> stores = stoClient.queryStoreByIds(collect);
- if (stores.size() > 0 ){
- for (Store store : stores) {
- StoreVos storeVos1 = new StoreVos();
- storeVos1.setNum1(store.getProvince() +"省"+ store.getCity() +"市");
- storeVos1.setNum2(store.getName());
- storeVos.add(storeVos1);
- }
- }
- }
- return storeVos;
- }
-
-
- @ResponseBody
- @PostMapping("/base/pointMerchars/getProvinces")
- public List<StoreVos> getProvinces(@RequestBody Integer id){
- List<StoreVos> storeVos = new ArrayList<>();
- List<PointsMerchandiseCity> list = pmdsCityService.list(new LambdaQueryWrapper<PointsMerchandiseCity>()
- .eq(PointsMerchandiseCity::getPointsMerchandiseId,id));
- if (list.size() > 0 ){
- for (PointsMerchandiseCity pointsMerchandiseCity : list) {
- StoreVos storeVos1 = new StoreVos();
- storeVos1.setNum1(pointsMerchandiseCity.getProvince());
- storeVos1.setNum2(pointsMerchandiseCity.getCity());
- storeVos.add(storeVos1);
- }
- }
- return storeVos;
- }
-
- @PostMapping("/base/pointMerchars/add")
- public Integer add(@RequestBody PointsMerchandise pointsMerchandise){
- Integer storeId = pointsMerchandise.getShelves();
- pointsMerchandise.setShelves(2);
- boolean save = pmdsService.save(pointsMerchandise);
- if(save && ToolUtil.isNotEmpty(storeId) && pointsMerchandise.getType()==2){
- PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
- pointsMerchandiseStore.setPointsMerchandiseId(pointsMerchandise.getId());
- pointsMerchandiseStore.setStoreId(storeId);
- save = pmdstoService.save(pointsMerchandiseStore);
- }
- if(save && pointsMerchandise.getType()==2 && ToolUtil.isNotEmpty(pointsMerchandise.getProvinceCode())){
- pmdsService.saveCity(pointsMerchandise.getId(),pointsMerchandise.getProvince(),pointsMerchandise.getProvinceCode(),pointsMerchandise.getCity(),pointsMerchandise.getCityCode());
- }
- if(save){
- return pointsMerchandise.getId();
- }
- return null;
- }
-
-
- @PostMapping("/base/pointMerchars/addOther")
- public Boolean addOther(@RequestBody String pam){
- Boolean save =false;
- String[] split = pam.split("_");
- for (String s : split[1].split(",")) {
- PointsMerchandiseStore pointsMerchandiseStore = new PointsMerchandiseStore();
- pointsMerchandiseStore.setPointsMerchandiseId(Integer.valueOf(split[0]));
- pointsMerchandiseStore.setStoreId(Integer.valueOf(s));
- save = pmdstoService.save(pointsMerchandiseStore);
- }
- return save;
- }
-
- @PostMapping("/base/pointMerchars/addCitys")
- public Boolean addCitys(@RequestBody ArrayList<Map<String, String>> objects){
- try {
- for (Map<String, String> object : objects) {
- pmdsService.saveCity(Integer.valueOf(object.get("id")),object.get("pName"),object.get("pCode"),object.get("cName"),object.get("cCode"));
- }
- return true;
- }catch (Exception e){
- e.printStackTrace();
- return false;
- }
-
- }
-
-
- @PostMapping("/base/pointMerchars/queryPointMerchaseById")
- public PointsMerchandise queryPointMerchaseById(@RequestBody Integer id){
- return pmdsService.getById(id);
- }
-
-
-
- @PostMapping("/base/pointMerchars/getshopName")
- public Integer getshopName(@RequestBody Integer id){
- List<PointsMerchandiseStore> list = pmdstoService.list(new LambdaQueryWrapper<PointsMerchandiseStore>().eq(PointsMerchandiseStore::getPointsMerchandiseId, id));
- PointsMerchandiseStore pointsMerchandiseStore = list.get(0);
- Integer storeId = pointsMerchandiseStore.getStoreId();
- return storeId;
}
}
--
Gitblit v1.7.1