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-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 104 ++++++++++-----------------------------------------
1 files changed, 21 insertions(+), 83 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
index 7b5790d..58c86e5 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java
@@ -14,12 +14,14 @@
import com.dsh.course.feignClient.activity.PointMercharsClient;
import com.dsh.course.feignClient.activity.model.*;
import com.dsh.guns.config.UserExt;
-import com.dsh.guns.core.base.controller.BaseController;
import com.dsh.guns.core.base.tips.ErrorTip;
import com.dsh.guns.core.base.tips.SuccessTip;
import com.dsh.guns.core.common.constant.factory.PageFactory;
import com.dsh.guns.core.util.ToolUtil;
-import com.dsh.guns.modular.system.model.*;
+import com.dsh.guns.modular.system.model.CouponDataVo;
+import com.dsh.guns.modular.system.model.Region;
+import com.dsh.guns.modular.system.model.TCity;
+import com.dsh.guns.modular.system.model.TStore;
import com.dsh.guns.modular.system.service.ICityService;
import com.dsh.guns.modular.system.service.IRegionService;
import com.dsh.guns.modular.system.service.IStoreService;
@@ -33,7 +35,10 @@
import javax.annotation.Resource;
import java.io.IOException;
import java.text.SimpleDateFormat;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
import java.util.stream.Collectors;
@@ -43,7 +48,7 @@
@Controller
@RequestMapping("/tGoods")
-public class TGoodsController extends BaseController {
+public class TGoodsController {
@@ -92,19 +97,6 @@
List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
model.addAttribute("list",list);
return PREFIX + "TGoods_add.html";
- }
-
- /**
- * 跳转到添加
- */
- @RequestMapping("/tGoods_info")
- public String tGoodsInfo(Model model) {
- Integer objectType = UserExt.getUser().getObjectType();
- System.out.println(objectType);
- model.addAttribute("userType",objectType);
- List<TCity> list = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
- model.addAttribute("list",list);
- return PREFIX + "TGoods_detail_one.html";
}
@@ -311,31 +303,14 @@
client.insertIntoData(dataVo);
return new SuccessTip<>();
}
-
- /**
- * 编辑 商品详情
- * @param pointMerchandiseId 商品Id
- * @param quantityIssued 发放数量
- * @param pickUpQuantity 限领数量
- * @param redemptionInstructions 说明
- * @param cover 封面图
- * @param productImages 商品图片
- * @param sort 排序
- * @return
- */
@PostMapping(value = "/update")
@ResponseBody
- public Object update( Integer pointMerchandiseId,Integer quantityIssued,Integer pickUpQuantity,String redemptionInstructions,String cover,String productImages,Integer sort){
- Map<String, Object> stringObjectHashMap = new HashMap<>();
- stringObjectHashMap.put("pointMerchandiseId",pointMerchandiseId);
- stringObjectHashMap.put("quantityIssued",quantityIssued);
- stringObjectHashMap.put("pickUpQuantity",pickUpQuantity);
- stringObjectHashMap.put("redemptionInstructions",redemptionInstructions);
- stringObjectHashMap.put("cover",cover);
- stringObjectHashMap.put("productImages",productImages);
- stringObjectHashMap.put("sort",sort);
- System.out.println(stringObjectHashMap);
- pointMercharsClient.updateGoodsDetail(stringObjectHashMap);
+ public Object update( Integer id,Integer num,Integer num1,String text){
+ Coupon coupon = client.queryCouponById(id);
+ coupon.setQuantityIssued(num);
+ coupon.setPickUpQuantity(num1);
+ coupon.setIllustrate(text);
+ client.updateCouponData(coupon);
return new SuccessTip<>();
}
@@ -363,7 +338,7 @@
/**
- * 跳转到修改商品详情
+ * 跳转到修改车辆管理
*/
@RequestMapping("/tGoods_update/{id}")
public String tCityUpdate(@PathVariable Integer id, Model model) {
@@ -371,11 +346,8 @@
PointMercharsVo pointMercharsVo = pointMercharsClient.queryPointMerchaseDetailOfId(id);
System.out.println("pointMercharsVo:"+pointMercharsVo);
String[] split = pointMercharsVo.getPics().split(",");
- List<String> list = Arrays.asList(split);
- model.addAttribute("id",id);
model.addAttribute("item",pointMercharsVo);
- model.addAttribute("pictures",list);
- System.out.println(list);
+ model.addAttribute("pictures",split);
return PREFIX + "TGoods_edit.html";
}
@@ -462,44 +434,10 @@
*/
@RequestMapping("/write_off")
@ResponseBody
- public Object GoodsWriteOff(String id){
- Integer objectType = UserExt.getUser().getObjectType();
- Map<String, Object> stringObjectHashMap = new HashMap<>();
- stringObjectHashMap.put("goodsId",id);
- stringObjectHashMap.put("managerId",objectType);
- boolean b = pointMercharsClient.writeOffGoodsStatus(stringObjectHashMap);
- System.out.println(b);
- if (b){
- return new SuccessTip<>();
- }else {
- return ERROR;
- }
-
- }
-
-
- /**
- * 跳转到修改商品详情
- */
- @RequestMapping("/goods_info/{id}")
- public String goodsInfo(@PathVariable Integer id, Model model) {
- System.out.println("id:"+id);
- GoodsInfoOneVo infoOneVo = pointMercharsClient.queryDetailsOfGoods(id);
- System.out.println("pointMercharsVo:"+infoOneVo);
- model.addAttribute("item",infoOneVo);
- String[] split = infoOneVo.getPics().split(",");
- List<String> list = Arrays.asList(split);
- if (infoOneVo.getUseScope() == 2){
- List<StoreVos> provinces = pointMercharsClient.getProvinces(id);
- model.addAttribute("city",provinces);
- }
- if (infoOneVo.getUseScope() == 2){
- List<StoreVos> storeVos = pointMercharsClient.getStoreList(id);
- model.addAttribute("store",storeVos);
- }
- model.addAttribute("pictures",list);
- model.addAttribute("exchangeMethod",infoOneVo.getExchangeMethod());
- return PREFIX + "TGoods_detail_one.html";
+ public Object GoodsWriteOff(Integer id){
+ System.out.println(id);
+ // TODO: 2023/8/15 核销操作
+ return new SuccessTip<>();
}
--
Gitblit v1.7.1