From 1d9f7b0cf4251f3058badb07dd7a2bc06b6bc09a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 11 四月 2025 10:05:32 +0800
Subject: [PATCH] bug修改
---
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java | 47 ++++++++++++++++++++++++++++++++++++-----------
1 files changed, 36 insertions(+), 11 deletions(-)
diff --git a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
index 95e930c..d65ffc3 100644
--- a/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
+++ b/cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/THuiminCardController.java
@@ -67,18 +67,16 @@
*/
@RequestMapping("/tHuiminCard_detail/{id}")
public String tHuiminCardDetail(@PathVariable("id") Integer id) {
- THuiminCard byId = huiminCardClient.getById(id);
- Date startTime = byId.getStartTime();
- if (startTime != null){
- byId.setStartTimeStr(DateUtil.format(startTime, "yyyy-MM-dd HH:mm:ss"));
- }
- Date endTime = byId.getEndTime();
- if (endTime != null){
- byId.setEndTimeStr(DateUtil.format(endTime, "yyyy-MM-dd HH:mm:ss"));
- }
- String jsonString = JSONObject.toJSONString(byId);
- setAttr("tHuiminCard", jsonString);
return PREFIX + "tHuiminCard_detail.html";
+ }
+
+ /**
+ * 获取惠民卡详情
+ */
+ @RequestMapping("/getDetail")
+ @ResponseBody
+ public THuiminCard getDetail(Integer id) {
+ return huiminCardClient.getById(id);
}
@@ -186,12 +184,39 @@
@PostMapping(value = "/add")
@ResponseBody
public Object add(THuiminCard tHuiminCard) {
+ int a = 0;
+ if (tHuiminCard.getUseScope()==1){
+ tHuiminCard.setStoreIds(tHuiminCard.getUseIds());
+ }else{
+ StringBuilder storeIds = new StringBuilder();
+ for (String s : tHuiminCard.getUseIds().split(",")) {
+ TSite site = tSiteService.getById(s);
+ if (site!=null){
+ storeIds.append(site.getStoreId()).append(",");
+ }
+ }
+ StringBuilder stringBuilder = storeIds.deleteCharAt(storeIds.length() - 1);
+ tHuiminCard.setStoreIds(stringBuilder.toString());
+ }
huiminCardClient.save(tHuiminCard);
return SUCCESS_TIP;
}
@RequestMapping(value = "/update")
@ResponseBody
public Object update(THuiminCard tHuiminCard) {
+ if (tHuiminCard.getUseScope()==1){
+ tHuiminCard.setStoreIds(tHuiminCard.getUseIds());
+ }else{
+ StringBuilder storeIds = new StringBuilder();
+ for (String s : tHuiminCard.getUseIds().split(",")) {
+ TSite site = tSiteService.getById(s);
+ if (site!=null){
+ storeIds.append(site.getStoreId()).append(",");
+ }
+ }
+ StringBuilder stringBuilder = storeIds.deleteCharAt(storeIds.length() - 1);
+ tHuiminCard.setStoreIds(stringBuilder.toString());
+ }
huiminCardClient.updateById(tHuiminCard);
return SUCCESS_TIP;
}
--
Gitblit v1.7.1