From 062fb1ed6efcaac5d75bbe184524c4929dff7fcd Mon Sep 17 00:00:00 2001
From: nickchange <126672920+nickchange@users.noreply.github.com>
Date: 星期三, 18 十月 2023 15:25:35 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TGoodsController.java | 52 +++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 47 insertions(+), 5 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 20f337d..876fb08 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";
}
/**
@@ -153,7 +158,7 @@
List<StoreVos> provinces = pointMercharsClient.getProvinces(id);
model.addAttribute("city",provinces);
}
- if (infoOneVo.getUseScope() == 2){
+ if (infoOneVo.getUseScope() == 3){
List<StoreVos> storeVos = pointMercharsClient.getStoreList(id);
model.addAttribute("store",storeVos);
}
@@ -244,6 +249,8 @@
model.addAttribute("list",provinceList);
return PREFIX + "TStoreList.html";
}
+
+
/**
* 跳转到门店管理列表页
*/
@@ -475,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){
@@ -527,6 +534,33 @@
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;
+ }
@@ -537,13 +571,21 @@
public String tCityUpdate(@PathVariable Integer id, Model model) {
System.out.println("id:"+id);
PointMercharsVo pointMercharsVo = pointMercharsClient.queryPointMerchaseDetailOfId(id);
+
System.out.println("pointMercharsVo:"+pointMercharsVo);
String[] split = pointMercharsVo.getPics().split(",");
- List<String> list = Arrays.asList(split);
+ StringBuilder concatenatedString = new StringBuilder();
+ for (String element : split) {
+ concatenatedString.append(element).append(",");
+ }
+ // 去除末尾的逗号
+ if (concatenatedString.length() > 0) {
+ concatenatedString.setLength(concatenatedString.length() - 1);
+ }
+ String result = concatenatedString.toString();
model.addAttribute("id",id);
model.addAttribute("item",pointMercharsVo);
- model.addAttribute("pictures",list);
- System.out.println(list);
+ model.addAttribute("pictures",result);
return PREFIX + "TGoods_edit.html";
}
--
Gitblit v1.7.1