From 38ac3edec220a57026141ca08128518a65751c9a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 07 六月 2023 18:13:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/1.1' into 1.1
---
management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java | 62 +++++++++++++++++++++++++++++--
1 files changed, 58 insertions(+), 4 deletions(-)
diff --git a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
index 1827b37..11fe076 100644
--- a/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
+++ b/management/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TAgentController.java
@@ -135,10 +135,59 @@
*/
@RequestMapping("/areaDetail")
public String areaDetail(String area,String areaId,Model model) {
+// String[] split1 = areaId.split("/");
+// List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
+// model.addAttribute("provinceList",tRegions);
+//// List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
+//// // 查询市
+//// List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
+//// model.addAttribute("cityList",tRegions1);
+////
+//// // 查询区
+//// List<Integer> cityIds = tRegions1.stream().map(TRegion::getId).collect(Collectors.toList());
+//// List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", cityIds));
+//// model.addAttribute("districtList",tRegions2);
+//
+// if(StringUtils.hasLength(area) && StringUtils.hasLength(areaId)){
+// String[] split = area.split("/");
+// model.addAttribute("provinceName",split[0]);
+// model.addAttribute("cityName",split[1]);
+// if(split.length>2){
+// model.addAttribute("districtName",split[2]);
+// }else {
+// model.addAttribute("districtName","");
+// }
+//
+// model.addAttribute("provinceId",split1[0]);
+// model.addAttribute("cityId",split1[1]);
+// if(split1.length>2) {
+// model.addAttribute("districtId", split1[2]);
+// }else {
+// model.addAttribute("districtId", "");
+// }
+//
+// List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
+// model.addAttribute("cityList",tRegions1);
+//
+// // 查询区
+// List<TRegion> tRegions2 = tRegionService.selectList(new EntityWrapper<TRegion>().in("parent_id", split1[1]));
+// model.addAttribute("districtList",tRegions2);
+// }else {
+// model.addAttribute("cityList",new ArrayList<>());
+// model.addAttribute("districtList",new ArrayList<>());
+//
+// model.addAttribute("provinceName","");
+// model.addAttribute("cityName","");
+// model.addAttribute("districtName","");
+//
+// model.addAttribute("provinceId","");
+// model.addAttribute("cityId","");
+// model.addAttribute("districtId", "");
+// }
String[] split1 = areaId.split("/");
List<TRegion> tRegions = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", 0));
- model.addAttribute("province",tRegions);
- List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
+ model.addAttribute("provinceList",tRegions);
+// List<Integer> provinceIds = tRegions.stream().map(TRegion::getId).collect(Collectors.toList());
// 查询市
List<TRegion> tRegions1 = tRegionService.selectList(new EntityWrapper<TRegion>().eq("parent_id", split1[0]));
model.addAttribute("cityList",tRegions1);
@@ -190,7 +239,12 @@
String[] split1 = tAgent.getArea().split("/");
- int count = tAgentService.selectCount(new EntityWrapper<TAgent>().eq("provinceName", split1[0]).eq("cityName",split1[1]));
+// int count = tAgentService.selectCount(new EntityWrapper<TAgent>()
+// .eq("provinceName", split1[0])
+// .eq("cityName",split1[1])
+// .eq("districtName",sp));
+ int count = tAgentService.selectCount(new EntityWrapper<TAgent>()
+ .eq("merchantName", tAgent.getMerchantName()));
if(count>0){
return new SuccessTip(500,"该代理商已存在!");
}
@@ -709,7 +763,7 @@
model.addAttribute("roleType", roleType);
model.addAttribute("item", tAgent);
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- model.addAttribute("socialCreditCodeExpires", roleType == 1 ? "" : sdf.format(tAgent.getSocialCreditCodeExpires()));
+ model.addAttribute("socialCreditCodeExpires", roleType == 1 ? "" :Objects.isNull(tAgent.getSocialCreditCodeExpires())?"": sdf.format(tAgent.getSocialCreditCodeExpires()));
model.addAttribute("certIdExpires", roleType == 1 ? "" : sdf.format(tAgent.getCertIdExpires()));
Wrapper<SettlementRecord> settlementRecordWrapper = new EntityWrapper<SettlementRecord>().eq("type", roleType == 1 ? 1 : 2);
if(roleType == 2){
--
Gitblit v1.7.1