From 232d3efb20f87f9c60faeda7bae4bc96e5687bd3 Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 11 十月 2023 19:19:47 +0800
Subject: [PATCH] 10.12
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 71 +++++++++++++++++++++++++++++++++--
1 files changed, 67 insertions(+), 4 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 7c36464..a1cbbd4 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
@@ -51,6 +51,7 @@
private String PREFIX = "/system/tGoods/";
+ private String PREFIX1 = "/system/tGoodsAudit/";
@Resource
@@ -85,6 +86,10 @@
public String index(Model model) {
return PREFIX + "TGoods.html";
+ }
+ @RequestMapping("/audit")
+ public String audit(Model model) {
+ return PREFIX1 + "TGoodsAudit.html";
}
/**
@@ -240,7 +245,20 @@
*/
@RequestMapping("/storeList")
public String storePage(Model model) {
+ List<TCity> provinceList = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",provinceList);
return PREFIX + "TStoreList.html";
+ }
+
+
+ /**
+ * 跳转到门店管理列表页
+ */
+ @RequestMapping("/storeList1")
+ public String storePage1(Model model) {
+ List<TCity> provinceList = cityService.list(new LambdaQueryWrapper<TCity>().eq(TCity::getParentId, 0));
+ model.addAttribute("list",provinceList);
+ return PREFIX + "TStoreListOne.html";
}
@RequestMapping("/updateType")
@ResponseBody
@@ -464,7 +482,7 @@
pointsMerchandise.setInsertTime(new Date());
pointsMerchandise.setCoursePackageConfigId(coursePackageConfigId);
// 代替storeId
- pointsMerchandise.setShelves(storeId);
+ pointsMerchandise.setShelves(1);
Integer id = pointMercharsClient.add(pointsMerchandise);
if(typeAll!=2){
if(useScope==2){
@@ -515,6 +533,33 @@
ofSearch.setState(state);
System.out.println(ofSearch);
return pointMercharsClient.getIntegralGoodsListOfSearch(ofSearch);
+ }
+ @RequestMapping(value = "/listAudit")
+ @ResponseBody
+ public Object listOfIntegralGoodsAudit(String name, Integer type, Integer redemptionMethod , Integer userPopulation, Integer activeStatus) {
+ Page<Map<String, Object>> page = new PageFactory<Map<String, Object>>().defaultPage();
+ IntegralGoodsOfSearch ofSearch = new IntegralGoodsOfSearch();
+ ofSearch.setPage(page);
+ ofSearch.setName(name);
+ ofSearch.setType(type);
+ ofSearch.setRedemptionMethod(redemptionMethod);
+ ofSearch.setUserPopulation(userPopulation);
+ ofSearch.setActiveStatus(activeStatus);
+ return pointMercharsClient.getIntegralGoodsListOfSearchAudit(ofSearch);
+ }
+
+
+
+
+
+
+
+
+ @RequestMapping(value = "/updateTypeOne")
+ @ResponseBody
+ public Object updateTypeOne(Integer id, Integer type, String remark) {
+ Object o = pointMercharsClient.updateType(id + "_" + type + "_" + remark);
+ return SUCCESS_TIP;
}
@@ -568,8 +613,17 @@
model.addAttribute("id",id);
return PREFIX + "TGoods_pay.html";
}
-
-
+ /**
+ * 购买详情
+ * @param id 商品id
+ * @return
+ */
+ @RequestMapping("/tPay_detail1/{id}")
+ public String payOfDetailsOne(@PathVariable(value = "id") Integer id,Model model) {
+ System.out.println(id);
+ model.addAttribute("id",id);
+ return PREFIX + "TGoods_payOne.html";
+ }
/**
* 获取 购买记录列表
*/
@@ -582,9 +636,18 @@
payedVo.setPhone(phone);
payedVo.setStatus(status);
List<Map<String,Object>> points = pointMercharsClient.queryUserPayedGoodsList(payedVo);
- System.out.println(points);
+ System.out.println(points);
if (points.size() > 0 ){
+
for (Map<String, Object> point : points) {
+ Object id1 = point.get("id");
+ String idAsString = String.valueOf(id1);
+
+ // 移除原始的 "id" 键
+ point.remove("id");
+
+ // 将字符串类型的 "id" 放回 Map 对象中
+ point.put("id", idAsString);
Integer userId = (Integer) point.get("userId");
TAppUser tAppUser = appUserClient.queryById(userId);
if (ToolUtil.isNotEmpty(tAppUser)){
--
Gitblit v1.7.1