From 7732cac9da04bb75e9f655b6fd7e068e14bfc1cc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 27 十二月 2024 16:06:19 +0800
Subject: [PATCH] 修改bug
---
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml | 6
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java | 20 ++-
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java | 1
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml | 6
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/City.java | 11 ++
ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html | 54 +++++-----
ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java | 149 +++++++++++++++--------------
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml | 1
UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java | 12 ++
9 files changed, 144 insertions(+), 116 deletions(-)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
index a0863a9..9636de0 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TCompanyController.java
@@ -323,18 +323,20 @@
}
//添加经营区域
public void addSocpe(String subArr,Integer id){
+ tCompanyCityService.delete(new EntityWrapper<TCompanyCity>().eq("companyId", id));
JSONArray jsonArray = JSON.parseArray(subArr);
int size = jsonArray.size();
- for (int i = 0; i < size; i++){
+ List<TCompanyCity> list = new ArrayList<>();
+ for (int i = 0; i < size; i++) {
JSONObject jsonObject = jsonArray.getJSONObject(i);
- TCompanyCity tCompanyCity = tCompanyCityService.selectOne(new EntityWrapper<TCompanyCity>().eq("id", jsonObject.getInteger("recordId")).eq("companyId", id));
- if (SinataUtil.isEmpty(tCompanyCity)){
- tCompanyCity = new TCompanyCity();
- tCompanyCity.setCityId(jsonObject.getInteger("cityId"));
- tCompanyCity.setCompanyId(id);
- tCompanyCity.setState(1);
- tCompanyCityService.insert(tCompanyCity);
- }
+ TCompanyCity tCompanyCity = new TCompanyCity();
+ tCompanyCity.setCityId(jsonObject.getInteger("cityId"));
+ tCompanyCity.setCompanyId(id);
+ tCompanyCity.setState(1);
+ list.add(tCompanyCity);
+ }
+ if(list.size() > 0){
+ tCompanyCityService.insertBatch(list);
}
}
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
index fe8d63e..496e7c0 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/TSysReformistController.java
@@ -349,11 +349,11 @@
@RequestParam Double zc1,@RequestParam Integer zc2,@RequestParam Double zc3,
@RequestParam Double zc4,@RequestParam Integer zc5,@RequestParam Double zc6,
@RequestParam Double zc7,@RequestParam Integer zc8,@RequestParam Double zc9,
- @RequestParam Double czc1,@RequestParam Integer czc2,@RequestParam Double czc3,
- @RequestParam Double czc4,@RequestParam Integer czc5,@RequestParam Double czc6,
- @RequestParam Double czc7,@RequestParam Integer czc8,@RequestParam Double czc9,
- @RequestParam Double zcAssignOrder,@RequestParam Double czcAssignOrder,
- @RequestParam Integer zcPeople,@RequestParam Integer czcPeople,
+// @RequestParam Double czc1,@RequestParam Integer czc2,@RequestParam Double czc3,
+// @RequestParam Double czc4,@RequestParam Integer czc5,@RequestParam Double czc6,
+// @RequestParam Double czc7,@RequestParam Integer czc8,@RequestParam Double czc9,
+ @RequestParam Double zcAssignOrder,/*@RequestParam Double czcAssignOrder,*/
+ @RequestParam Integer zcPeople,/*@RequestParam Integer czcPeople,*/
@RequestParam Integer ptCancel1,@RequestParam String ptCancel2,@RequestParam Integer ptCancel3,@RequestParam BigDecimal ptCancel4,@RequestParam Integer ptCancel5,@RequestParam BigDecimal ptCancel6,
@RequestParam Integer yyCancel1,@RequestParam String yyCancel2,@RequestParam Integer yyCancel3,@RequestParam BigDecimal yyCancel4,
@RequestParam String phone1,@RequestParam String phone2,@RequestParam String phone3,@RequestParam String assessment,
@@ -473,70 +473,70 @@
}
//出租车推单(第一轮)
- TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
- if (SinataUtil.isNotEmpty(czcOne)){
- czcOne.setPushDistance(czc1);
- czcOne.setPushTime(czc2);
- czcOne.setDriverProportion(czc3);
- tSysPushOrderService.updateById(czcOne);
- }else{
- czcOne = new TSysPushOrder();
- czcOne.setPushDistance(czc1);
- czcOne.setPushTime(czc2);
- czcOne.setDriverProportion(czc3);
- czcOne.setCompanyId(ShiroKit.getUser().getObjectId());
- czcOne.setPushType(2);
- czcOne.setType(1);
- tSysPushOrderService.insert(czcOne);
- }
- //出租车推单(第二轮)
- TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
- if (SinataUtil.isNotEmpty(czcTwo)){
- czcTwo.setPushDistance(czc4);
- czcTwo.setPushTime(czc5);
- czcTwo.setDriverProportion(czc6);
- tSysPushOrderService.updateById(czcTwo);
- }else{
- czcTwo = new TSysPushOrder();
- czcTwo.setPushDistance(czc4);
- czcTwo.setPushTime(czc5);
- czcTwo.setDriverProportion(czc6);
- czcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
- czcTwo.setPushType(2);
- czcTwo.setType(2);
- tSysPushOrderService.insert(czcTwo);
- }
- //出租车推单(第三轮)
- TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
- if (SinataUtil.isNotEmpty(czcThree)){
- czcThree.setPushDistance(czc7);
- czcThree.setPushTime(czc8);
- czcThree.setDriverProportion(czc9);
- tSysPushOrderService.updateById(czcThree);
- }else{
- czcThree = new TSysPushOrder();
- czcThree.setPushDistance(czc7);
- czcThree.setPushTime(czc8);
- czcThree.setDriverProportion(czc9);
- czcThree.setCompanyId(ShiroKit.getUser().getObjectId());
- czcThree.setPushType(2);
- czcThree.setType(3);
- tSysPushOrderService.insert(czcThree);
- }
- //出租车指派
- AssignOrder assignOrder1 = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));
- if(SinataUtil.isNotEmpty(assignOrder1)){
- assignOrder1.setDistance(czcAssignOrder);
- assignOrder.setPeople(czcPeople);
- assignOrderService.updateById(assignOrder1);
- }else{
- assignOrder1 = new AssignOrder();
- assignOrder1.setCompanyId(ShiroKit.getUser().getObjectId());
- assignOrder1.setType(2);
- assignOrder1.setDistance(czcAssignOrder);
- assignOrder.setPeople(czcPeople);
- assignOrderService.insert(assignOrder1);
- }
+// TSysPushOrder czcOne = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 1));
+// if (SinataUtil.isNotEmpty(czcOne)){
+// czcOne.setPushDistance(czc1);
+// czcOne.setPushTime(czc2);
+// czcOne.setDriverProportion(czc3);
+// tSysPushOrderService.updateById(czcOne);
+// }else{
+// czcOne = new TSysPushOrder();
+// czcOne.setPushDistance(czc1);
+// czcOne.setPushTime(czc2);
+// czcOne.setDriverProportion(czc3);
+// czcOne.setCompanyId(ShiroKit.getUser().getObjectId());
+// czcOne.setPushType(2);
+// czcOne.setType(1);
+// tSysPushOrderService.insert(czcOne);
+// }
+// //出租车推单(第二轮)
+// TSysPushOrder czcTwo = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 2));
+// if (SinataUtil.isNotEmpty(czcTwo)){
+// czcTwo.setPushDistance(czc4);
+// czcTwo.setPushTime(czc5);
+// czcTwo.setDriverProportion(czc6);
+// tSysPushOrderService.updateById(czcTwo);
+// }else{
+// czcTwo = new TSysPushOrder();
+// czcTwo.setPushDistance(czc4);
+// czcTwo.setPushTime(czc5);
+// czcTwo.setDriverProportion(czc6);
+// czcTwo.setCompanyId(ShiroKit.getUser().getObjectId());
+// czcTwo.setPushType(2);
+// czcTwo.setType(2);
+// tSysPushOrderService.insert(czcTwo);
+// }
+// //出租车推单(第三轮)
+// TSysPushOrder czcThree = tSysPushOrderService.selectOne(new EntityWrapper<TSysPushOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("pushType", 2).eq("type", 3));
+// if (SinataUtil.isNotEmpty(czcThree)){
+// czcThree.setPushDistance(czc7);
+// czcThree.setPushTime(czc8);
+// czcThree.setDriverProportion(czc9);
+// tSysPushOrderService.updateById(czcThree);
+// }else{
+// czcThree = new TSysPushOrder();
+// czcThree.setPushDistance(czc7);
+// czcThree.setPushTime(czc8);
+// czcThree.setDriverProportion(czc9);
+// czcThree.setCompanyId(ShiroKit.getUser().getObjectId());
+// czcThree.setPushType(2);
+// czcThree.setType(3);
+// tSysPushOrderService.insert(czcThree);
+// }
+// //出租车指派
+// AssignOrder assignOrder1 = assignOrderService.selectOne(new EntityWrapper<AssignOrder>().eq("companyId", ShiroKit.getUser().getObjectId()).eq("type", 2));
+// if(SinataUtil.isNotEmpty(assignOrder1)){
+// assignOrder1.setDistance(czcAssignOrder);
+// assignOrder.setPeople(czcPeople);
+// assignOrderService.updateById(assignOrder1);
+// }else{
+// assignOrder1 = new AssignOrder();
+// assignOrder1.setCompanyId(ShiroKit.getUser().getObjectId());
+// assignOrder1.setType(2);
+// assignOrder1.setDistance(czcAssignOrder);
+// assignOrder.setPeople(czcPeople);
+// assignOrderService.insert(assignOrder1);
+// }
TSysCancleOrder cancleOrder = tSysCancleOrderService.selectOne(new EntityWrapper<TSysCancleOrder>().eq("companyId", ShiroKit.getUser().getObjectId()));
// {"order":{"orderAcceptanceTime":5,"money":2.5,"mileageFee":1,"durationFee":0.5},"reservationOrder":{"orderAcceptanceTime":5,"money":2.5,"mileageFee":1,"durationFee":0.5,"reservationFee":5},"driverTimeout":10}
// 将数据拼接为json格式存储
@@ -569,8 +569,15 @@
String result = "{\""+"order\":{\"orderAcceptanceTime\":"+ptCancel1+","+"\"money\":"+ptCancel2+","+"\"mileageFee\":"+km+","+"\"durationFee\":"+kmMinute+"},"+"\"reservationOrder\":{\"orderAcceptanceTime\":"+yyCancel1+","+"\"money\":"+yyCancel2+","+"\"mileageFee\":"+km2+","+"\"durationFee\":"+kmMinute2+","+"\"reservationFee\":"+reserveMoney+"},"+"\"driverTimeout\":"+overtime+"}";
System.err.println("看看");
System.err.println(result);
- cancleOrder.setContent(result);
- tSysCancleOrderService.updateById(cancleOrder);
+ if(null != cancleOrder){
+ cancleOrder.setContent(result);
+ tSysCancleOrderService.updateById(cancleOrder);
+ }else{
+ cancleOrder = new TSysCancleOrder();
+ cancleOrder.setCompanyId(ShiroKit.getUser().getObjectId());
+ cancleOrder.setContent(result);
+ tSysCancleOrderService.insert(cancleOrder);
+ }
// JSONObject jsonObject = JSON.parseObject(cancleOrder.getContent());
// map.put("timeOutCancel", jsonObject.getIntValue("driverTimeout"));
// //普通取消设置(专车)
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
index 332145a..701e205 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderLogisticsMapper.xml
@@ -158,11 +158,11 @@
LEFT JOIN t_company as dd on dd.id = ci.companyId
LEFT JOIN t_order_cancel as oc on ot.id = oc.orderId and oc.orderType = 4
LEFT JOIN (
- SELECT ii.money,ii.incomeId,cc.type FROM t_income as ii
+ SELECT sum(ii.money) as money,ii.incomeId,cc.type FROM t_income as ii
LEFT JOIN t_company as cc on ii.objectId = cc.id
- where ii.userType = 1 and ii.type != 1 and ii.orderType = 4
+ where ii.userType = 1 and ii.type != 1 and ii.orderType = 4 group by ii.incomeId, cc.type
) as income1 on income1.incomeId = ot.id
- LEFT JOIN (SELECT incomeId, money FROM t_income where userType = 2 and type != 1 and orderType = 4) as income2 on income2.incomeId = ot.id
+ LEFT JOIN (SELECT incomeId, sum(money) as money FROM t_income where userType = 2 and type != 1 and orderType = 4 group by incomeId) as income2 on income2.incomeId = ot.id
LEFT JOIN t_settlement_detail sd on ot.id = sd.orderId and sd.orderType = 4
where ot.id = #{orderId}
</select>
diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
index 920960c..e1ac605 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/TOrderPrivateCarMapper.xml
@@ -175,11 +175,11 @@
LEFT JOIN t_server_carmodel as sc on sc.id = ot.serverCarModelId
LEFT JOIN t_order_cancel as oc on ot.id = oc.orderId and oc.orderType = 1
LEFT JOIN (
- SELECT ii.money,ii.incomeId,cc.type FROM t_income as ii
+ SELECT sum(ii.money) as money,ii.incomeId,cc.type FROM t_income as ii
LEFT JOIN t_company as cc on ii.objectId = cc.id
- where ii.userType = 1 and ii.type != 1 and ii.orderType = 1
+ where ii.userType = 1 and ii.type != 1 and ii.orderType = 1 group by ii.incomeId, cc.type
) as income1 on income1.incomeId = ot.id
- LEFT JOIN (SELECT incomeId, money FROM t_income where userType = 2 and type != 1 and orderType = 1) as income2 on income2.incomeId = ot.id
+ LEFT JOIN (SELECT incomeId, sum(money) as money FROM t_income where userType = 2 and type != 1 and orderType = 1 group by incomeId) as income2 on income2.incomeId = ot.id
LEFT JOIN t_settlement_detail sd on ot.id = sd.orderId and sd.orderType = 1
where ot.id = #{orderId}
</select>
diff --git a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
index 3c99847..c01b32a 100644
--- a/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
+++ b/ManagementIGOTravel/guns-admin/src/main/webapp/WEB-INF/view/system/tSysReformist/tSysReformist.html
@@ -569,17 +569,17 @@
var zcAssignOrder = $("#zcAssignOrder").val().trim();
var zcPeople = $('#zcPeople').val().trim();
- var czc1 = $("#czc1").val().trim();
- var czc2 = $("#czc2").val().trim();
- var czc3 = $("#czc3").val().trim();
- var czc4 = $("#czc4").val().trim();
- var czc5 = $("#czc5").val().trim();
- var czc6 = $("#czc6").val().trim();
- var czc7 = $("#czc7").val().trim();
- var czc8 = $("#czc8").val().trim();
- var czc9 = $("#czc9").val().trim();
- var czcAssignOrder = $("#czcAssignOrder").val().trim();
- var czcPeople = $('#czcPeople').val().trim();
+ // var czc1 = $("#czc1").val().trim();
+ // var czc2 = $("#czc2").val().trim();
+ // var czc3 = $("#czc3").val().trim();
+ // var czc4 = $("#czc4").val().trim();
+ // var czc5 = $("#czc5").val().trim();
+ // var czc6 = $("#czc6").val().trim();
+ // var czc7 = $("#czc7").val().trim();
+ // var czc8 = $("#czc8").val().trim();
+ // var czc9 = $("#czc9").val().trim();
+ // var czcAssignOrder = $("#czcAssignOrder").val().trim();
+ // var czcPeople = $('#czcPeople').val().trim();
var ptCancel1 = $("#ptCancel1").val().trim();
var ptCancel2 = $("#ptCancel2").val().trim();
@@ -612,7 +612,7 @@
if ("" == one || "" == two || "" == three
|| "" == zc1 || "" == zc2 || "" == zc3 || "" == zc4 || "" == zc5 || "" == zc6 || "" == zc7 || "" == zc8 || "" == zc9
|| '' == zcAssignOrder || '' == zcPeople
- || "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9 /*|| '' == czcAssignOrder || '' == czcPeople */
+ /*|| "" == czc1 || "" == czc2 || "" == czc3 || "" == czc4 || "" == czc5 || "" == czc6 || "" == czc7 || "" == czc8 || "" == czc9 || '' == czcAssignOrder || '' == czcPeople */
|| "" == ptCancel1 || "" == ptCancel2 /* || "" == ptCancel3 || "" == ptCancel4*/ /*|| "" == ptCancel5 || "" == ptCancel6*/
|| "" == yyCancel1 || "" == yyCancel2 /* || "" == yyCancel3 || "" == yyCancel4*/
|| "" == assessment || "" == km || "" == kmMinute|| "" == kmMinute2|| "" == reserveMoney|| "" == km2
@@ -633,10 +633,10 @@
|| !regDouble.test(zc1) || !regInt.test(zc2) || !regDouble.test(zc3)
|| !regDouble.test(zc4) || !regInt.test(zc5) || !regDouble.test(zc6)
|| !regDouble.test(zc7) || !regInt.test(zc8) || !regDouble.test(zc9) || !regDouble.test(zcAssignOrder) || !regInt.test(zcPeople)
-
- || !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3)
- || !regDouble.test(czc4) || !regInt.test(czc5) || !regDouble.test(czc6)
- || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9)/* || !regDouble.test(czcAssignOrder) || !regInt.test(czcPeople)*/
+ /*
+ || !regDouble.test(czc1) || !regInt.test(czc2) || !regDouble.test(czc3)
+ || !regDouble.test(czc4) || !regInt.test(czc5) || !regDouble.test(czc6)
+ || !regDouble.test(czc7) || !regInt.test(czc8) || !regDouble.test(czc9) || !regDouble.test(czcAssignOrder) || !regInt.test(czcPeople)*/
|| !regInt.test(ptCancel1) || !regDouble.test(ptCancel2) /*|| !regInt.test(ptCancel3) || !regDouble.test(ptCancel4)|| !regInt.test(ptCancel5) || !regDouble.test(ptCancel6)*/
|| !regDouble.test(km) || !regDouble.test(km2)
@@ -679,17 +679,17 @@
ajax.set("zcAssignOrder", zcAssignOrder);
ajax.set("zcPeople", zcPeople);
- ajax.set("czc1", czc1);
- ajax.set("czc2", czc2);
- ajax.set("czc3", czc3);
- ajax.set("czc4", czc4);
- ajax.set("czc5", czc5);
- ajax.set("czc6", czc6);
- ajax.set("czc7", czc7);
- ajax.set("czc8", czc8);
- ajax.set("czc9", czc9);
- ajax.set("czcAssignOrder", czcAssignOrder);
- ajax.set("czcPeople", czcPeople);
+ // ajax.set("czc1", czc1);
+ // ajax.set("czc2", czc2);
+ // ajax.set("czc3", czc3);
+ // ajax.set("czc4", czc4);
+ // ajax.set("czc5", czc5);
+ // ajax.set("czc6", czc6);
+ // ajax.set("czc7", czc7);
+ // ajax.set("czc8", czc8);
+ // ajax.set("czc9", czc9);
+ // ajax.set("czcAssignOrder", czcAssignOrder);
+ // ajax.set("czcPeople", czcPeople);
ajax.set("ptCancel1", ptCancel1);
ajax.set("ptCancel2", ptCancel2);
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml
index b37ae32..c491dd8 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/dao/mapping/PhoneMapper.xml
@@ -24,7 +24,6 @@
<foreach collection="companyIds" item="item" index="index" separator="," open="(" close=")">
#{item}
</foreach>
- )
</select>
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/City.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/City.java
index 56a5ad9..6a60615 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/City.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/model/City.java
@@ -28,6 +28,7 @@
private String countryChineseName;
private String countryEnglishName;
private String countryFrenchName;
+ private String countryCode;
public Integer getId() {
return id;
@@ -100,7 +101,15 @@
public void setCountryFrenchName(String countryFrenchName) {
this.countryFrenchName = countryFrenchName;
}
-
+
+ public String getCountryCode() {
+ return countryCode;
+ }
+
+ public void setCountryCode(String countryCode) {
+ this.countryCode = countryCode;
+ }
+
@Override
public String toString() {
return "City{" +
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java
index a38f19a..3de89ff 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OpenCityServiceImpl.java
@@ -62,6 +62,7 @@
baseWarpper.setLon(null != c.getLon() ? c.getLon() : 0);
baseWarpper.setLat(null != c.getLat() ? c.getLat() : 0);
baseWarpper.setContent(language == 1 ? city.getCountryChineseName() : language == 2 ? city.getCountryEnglishName() : language == 3 ? city.getCountryFrenchName() : city.getEnglishName());
+ baseWarpper.setCode(city.getCountryCode());
list.add(baseWarpper);
}
return list;
diff --git a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java
index ed5afe3..e17cf62 100644
--- a/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java
+++ b/UserIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/warpper/BaseWarpper.java
@@ -33,6 +33,8 @@
@ApiModelProperty("状态")
private Integer state = 0;
+ @ApiModelProperty("编号")
+ private String code;
public Integer getState() {
return state;
@@ -113,7 +115,15 @@
public void setLat(Double lat) {
this.lat = lat;
}
-
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
@Override
public String toString() {
return "BaseWarpper{" +
--
Gitblit v1.7.1