Skip to content

G
gdtel-gztel-school-center
Commit 63b24b0d by 罗承锋
Options

修改小白卡接口参数

parent 588e01ef
Showing with 404 additions and 6 deletions
common/src/main/java/com/winsun/utils/XbkUtil.java
...@@ -31,8 +31,10 @@ public class XbkUtil { ...@@ -31,8 +31,10 @@ public class XbkUtil {
mapParm.put("param", map); mapParm.put("param", map);
JSONObject json = new JSONObject(mapParm); JSONObject json = new JSONObject(mapParm);
JSONObject jsonObject = null; JSONObject jsonObject = null;
log.info(json.toJSONString());
try { try {
jsonObject = HttpHelper.doPost("http://enter.gd189.cn/o2oweb/outMain/service.do", json.toString()); jsonObject = HttpHelper.doPost("http://enter.gd189.cn/o2oweb/outMain/service.do", json.toString());
log.info(jsonObject.toJSONString());
}catch (Exception e){ }catch (Exception e){
log.error(type+"调取接口异常",e.getMessage()); log.error(type+"调取接口异常",e.getMessage());
} }
...@@ -51,12 +53,15 @@ public class XbkUtil { ...@@ -51,12 +53,15 @@ public class XbkUtil {
* @return * @return
*/ */
public static JSONObject xbkOrderJT0002(String businessNumber, String idCard, public static JSONObject xbkOrderJT0002(String businessNumber, String idCard,
String customerName,String contactNumber,String xbId ,String netId) throws Exception { String customerName,String contactNumber,
String xbId ,String netId, String sendCityCode, String custAffress) throws Exception {
Map<String, Object> map = new HashMap<>(); Map<String, Object> map = new HashMap<>();
map.put("prodId", xbId); map.put("prodId", xbId);
map.put("coUserId", netId); map.put("coUserId", netId);
map.put("phoneNumber", businessNumber); map.put("phoneNumber", businessNumber);
map.put("isDelivery", "1"); map.put("isDelivery", "1");
map.put("sendCityCode", sendCityCode);
map.put("custAffress", custAffress);
map.put("custName", customerName); map.put("custName", customerName);
map.put("idCardNo", idCard); map.put("idCardNo", idCard);
map.put("contactNumber", contactNumber); map.put("contactNumber", contactNumber);
......
new-user/src/main/java/com/winsun/common/CityCode.java 0 → 100644
package com.winsun.common;
/**
* 小白卡全国区号
* @author chengfengluo
* @date 2021-02-25 10:39
*/
public enum CityCode {
c8110100("8110100","北京市"),
c8120100("8120100","天津市"),
c8130100("8130100","石家庄市"),
c8130200("8130200","唐山市"),
c8130300("8130300","秦皇岛市"),
c8130400("8130400","邯郸市"),
c8130500("8130500","邢台市"),
c8130600("8130600","保定市"),
c8130700("8130700","张家口市"),
c8130800("8130800","承德市"),
c8130900("8130900","沧州市"),
c8131000("8131000","廊坊市"),
c8131100("8131100","衡水市"),
c8140100("8140100","太原市"),
c8140200("8140200","大同市"),
c8140300("8140300","阳泉市"),
c8140400("8140400","长治市"),
c8140500("8140500","晋城市"),
c8140600("8140600","朔州市"),
c8140700("8140700","晋中市"),
c8140800("8140800","运城市"),
c8140900("8140900","忻州市"),
c8141000("8141000","临汾市"),
c8141100("8141100","吕梁市"),
c8150100("8150100","呼和浩特市"),
c8150200("8150200","包头市"),
c8150300("8150300","乌海市"),
c8150400("8150400","赤峰市"),
c8150500("8150500","通辽市"),
c8150600("8150600","鄂尔多斯市"),
c8150700("8150700","呼伦贝尔市"),
c8150800("8150800","巴彦淖尔市"),
c8150900("8150900","乌兰察布市"),
c8152200("8152200","兴安盟"),
c8152500("8152500","锡林郭勒盟"),
c8152900("8152900","阿拉善盟"),
c8210100("8210100","沈阳市"),
c8210200("8210200","大连市"),
c8210300("8210300","鞍山市"),
c8210400("8210400","抚顺市"),
c8210500("8210500","本溪市"),
c8210600("8210600","丹东市"),
c8210700("8210700","锦州市"),
c8210800("8210800","营口市"),
c8210900("8210900","阜新市"),
c8211000("8211000","辽阳市"),
c8211100("8211100","盘锦市"),
c8211200("8211200","铁岭市"),
c8211300("8211300","朝阳市"),
c8211400("8211400","葫芦岛市"),
c8220100("8220100","长春市"),
c8220200("8220200","吉林市"),
c8220300("8220300","四平市"),
c8220400("8220400","辽源市"),
c8220500("8220500","通化市"),
c8220600("8220600","白山市"),
c8220700("8220700","松原市"),
c8220800("8220800","白城市"),
c8222400("8222400","延边朝鲜族自治州"),
c8230100("8230100","哈尔滨市"),
c8230200("8230200","齐齐哈尔市"),
c8230300("8230300","鸡西市"),
c8230400("8230400","鹤岗市"),
c8230500("8230500","双鸭山市"),
c8230600("8230600","大庆市"),
c8230700("8230700","伊春市"),
c8230800("8230800","佳木斯市"),
c8230900("8230900","七台河市"),
c8231000("8231000","牡丹江市"),
c8231100("8231100","黑河市"),
c8231200("8231200","绥化市"),
c8232700("8232700","大兴安岭地区"),
c8310100("8310100","上海市"),
c8320100("8320100","南京市"),
c8320200("8320200","无锡市"),
c8320300("8320300","徐州市"),
c8320400("8320400","常州市"),
c8320500("8320500","苏州市"),
c8320600("8320600","南通市"),
c8320700("8320700","连云港市"),
c8320800("8320800","淮安市"),
c8320900("8320900","盐城市"),
c8321000("8321000","扬州市"),
c8321100("8321100","镇江市"),
c8321200("8321200","泰州市"),
c8321300("8321300","宿迁市"),
c8330100("8330100","杭州市"),
c8330200("8330200","宁波市"),
c8330300("8330300","温州市"),
c8330400("8330400","嘉兴市"),
c8330500("8330500","湖州市"),
c8330600("8330600","绍兴市"),
c8330700("8330700","金华市"),
c8330800("8330800","衢州市"),
c8330900("8330900","舟山市"),
c8331000("8331000","台州市"),
c8331100("8331100","丽水市"),
c8340100("8340100","合肥市"),
c8340200("8340200","芜湖市"),
c8340300("8340300","蚌埠市"),
c8340400("8340400","淮南市"),
c8340500("8340500","马鞍山市"),
c8340600("8340600","淮北市"),
c8340700("8340700","铜陵市"),
c8340800("8340800","安庆市"),
c8341000("8341000","黄山市"),
c8341100("8341100","滁州市"),
c8341200("8341200","阜阳市"),
c8341300("8341300","宿州市"),
c8341500("8341500","六安市"),
c8341600("8341600","亳州市"),
c8341700("8341700","池州市"),
c8341800("8341800","宣城市"),
c8350100("8350100","福州市"),
c8350200("8350200","厦门市"),
c8350300("8350300","莆田市"),
c8350400("8350400","三明市"),
c8350500("8350500","泉州市"),
c8350600("8350600","漳州市"),
c8350700("8350700","南平市"),
c8350800("8350800","龙岩市"),
c8350900("8350900","宁德市"),
c8360100("8360100","南昌市"),
c8360200("8360200","景德镇市"),
c8360300("8360300","萍乡市"),
c8360400("8360400","九江市"),
c8360500("8360500","新余市"),
c8360600("8360600","鹰潭市"),
c8360700("8360700","赣州市"),
c8360800("8360800","吉安市"),
c8360900("8360900","宜春市"),
c8361000("8361000","抚州市"),
c8361100("8361100","上饶市"),
c8370100("8370100","济南市"),
c8370200("8370200","青岛市"),
c8370300("8370300","淄博市"),
c8370400("8370400","枣庄市"),
c8370500("8370500","东营市"),
c8370600("8370600","烟台市"),
c8370700("8370700","潍坊市"),
c8370800("8370800","济宁市"),
c8370900("8370900","泰安市"),
c8371000("8371000","威海市"),
c8371100("8371100","日照市"),
c8371200("8371200","莱芜市"),
c8371300("8371300","临沂市"),
c8371400("8371400","德州市"),
c8371500("8371500","聊城市"),
c8371600("8371600","滨州市"),
c8371700("8371700","菏泽市"),
c8410100("8410100","郑州市"),
c8410200("8410200","开封市"),
c8410300("8410300","洛阳市"),
c8410400("8410400","平顶山市"),
c8410500("8410500","安阳市"),
c8410600("8410600","鹤壁市"),
c8410700("8410700","新乡市"),
c8410800("8410800","焦作市"),
c8410900("8410900","濮阳市"),
c8411000("8411000","许昌市"),
c8411100("8411100","漯河市"),
c8411200("8411200","三门峡市"),
c8411300("8411300","南阳市"),
c8411400("8411400","商丘市"),
c8411500("8411500","信阳市"),
c8411600("8411600","周口市"),
c8411700("8411700","驻马店市"),
c8419000("8419000","省直辖县级行政区划"),
c8420100("8420100","武汉市"),
c8420200("8420200","黄石市"),
c8420300("8420300","十堰市"),
c8420500("8420500","宜昌市"),
c8420600("8420600","襄樊市"),
c8420700("8420700","鄂州市"),
c8420800("8420800","荆门市"),
c8420900("8420900","孝感市"),
c8421000("8421000","荆州市"),
c8421100("8421100","黄冈市"),
c8421200("8421200","咸宁市"),
c8421300("8421300","随州市"),
c8422800("8422800","恩施土家族苗族自治州"),
c8429000("8429000","省直辖县级行政区划"),
c8429004("8429004","仙桃市"),
c8429005("8429005","潜江市"),
c8429006("8429006","天门市"),
c8429021("8429021","神农架林区"),
c8430100("8430100","长沙市"),
c8430200("8430200","株洲市"),
c8430300("8430300","湘潭市"),
c8430400("8430400","衡阳市"),
c8430500("8430500","邵阳市"),
c8430600("8430600","岳阳市"),
c8430700("8430700","常德市"),
c8430800("8430800","张家界市"),
c8430900("8430900","益阳市"),
c8431000("8431000","郴州市"),
c8431100("8431100","永州市"),
c8431200("8431200","怀化市"),
c8431300("8431300","娄底市"),
c8433100("8433100","湘西土家族苗族自治州"),
c8440100("8440100","广州市"),
c8440200("8440200","韶关市"),
c8440300("8440300","深圳市"),
c8440400("8440400","珠海市"),
c8440500("8440500","汕头市"),
c8440600("8440600","佛山市"),
c8440700("8440700","江门市"),
c8440800("8440800","湛江市"),
c8440900("8440900","茂名市"),
c8441200("8441200","肇庆市"),
c8441300("8441300","惠州市"),
c8441400("8441400","梅州市"),
c8441500("8441500","汕尾市"),
c8441600("8441600","河源市"),
c8441700("8441700","阳江市"),
c8441800("8441800","清远市"),
c8441900("8441900","东莞市"),
c8442000("8442000","中山市"),
c8445100("8445100","潮州市"),
c8445200("8445200","揭阳市"),
c8445300("8445300","云浮市"),
c8450100("8450100","南宁市"),
c8450200("8450200","柳州市"),
c8450300("8450300","桂林市"),
c8450400("8450400","梧州市"),
c8450500("8450500","北海市"),
c8450600("8450600","防城港市"),
c8450700("8450700","钦州市"),
c8450800("8450800","贵港市"),
c8450900("8450900","玉林市"),
c8451000("8451000","百色市"),
c8451100("8451100","贺州市"),
c8451200("8451200","河池市"),
c8451300("8451300","来宾市"),
c8451400("8451400","崇左市"),
c8460100("8460100","海口市"),
c8460200("8460200","三亚市"),
c8469000("8469000","省直辖县级行政区划"),
c8500100("8500100","重庆市"),
c8510100("8510100","成都市"),
c8510300("8510300","自贡市"),
c8510400("8510400","攀枝花市"),
c8510500("8510500","泸州市"),
c8510600("8510600","德阳市"),
c8510700("8510700","绵阳市"),
c8510800("8510800","广元市"),
c8510900("8510900","遂宁市"),
c8511000("8511000","内江市"),
c8511100("8511100","乐山市"),
c8511300("8511300","南充市"),
c8511400("8511400","眉山市"),
c8511500("8511500","宜宾市"),
c8511600("8511600","广安市"),
c8511700("8511700","达州市"),
c8511800("8511800","雅安市"),
c8511900("8511900","巴中市"),
c8512000("8512000","资阳市"),
c8513200("8513200","阿坝藏族羌族自治州"),
c8513300("8513300","甘孜藏族自治州"),
c8513400("8513400","凉山彝族自治州"),
c8520100("8520100","贵阳市"),
c8520200("8520200","六盘水市"),
c8520300("8520300","遵义市"),
c8520400("8520400","安顺市"),
c8522200("8522200","铜仁地区"),
c8522300("8522300","黔西南布依族苗族自治州"),
c8522400("8522400","毕节地区"),
c8522600("8522600","黔东南苗族侗族自治州"),
c8522700("8522700","黔南布依族苗族自治州"),
c8530100("8530100","昆明市"),
c8530300("8530300","曲靖市"),
c8530400("8530400","玉溪市"),
c8530500("8530500","保山市"),
c8530600("8530600","昭通市"),
c8530700("8530700","丽江市"),
c8530800("8530800","普洱市"),
c8530900("8530900","临沧市"),
c8532300("8532300","楚雄彝族自治州"),
c8532500("8532500","红河哈尼族彝族自治州"),
c8532600("8532600","文山壮族苗族自治州"),
c8532800("8532800","西双版纳傣族自治州"),
c8532900("8532900","大理白族自治州"),
c8533100("8533100","德宏傣族景颇族自治州"),
c8533300("8533300","怒江傈僳族自治州"),
c8533400("8533400","迪庆藏族自治州"),
c8540100("8540100","拉萨市"),
c8542100("8542100","昌都地区"),
c8542200("8542200","山南地区"),
c8542300("8542300","日喀则地区"),
c8542400("8542400","那曲地区"),
c8542500("8542500","阿里地区"),
c8542600("8542600","林芝地区"),
c8610100("8610100","西安市"),
c8610200("8610200","铜川市"),
c8610300("8610300","宝鸡市"),
c8610400("8610400","咸阳市"),
c8610500("8610500","渭南市"),
c8610600("8610600","延安市"),
c8610700("8610700","汉中市"),
c8610800("8610800","榆林市"),
c8610900("8610900","安康市"),
c8611000("8611000","商洛市"),
c8620100("8620100","兰州市"),
c8620200("8620200","嘉峪关市"),
c8620300("8620300","金昌市"),
c8620400("8620400","白银市"),
c8620500("8620500","天水市"),
c8620600("8620600","武威市"),
c8620700("8620700","张掖市"),
c8620800("8620800","平凉市"),
c8620900("8620900","酒泉市"),
c8621000("8621000","庆阳市"),
c8621100("8621100","定西市"),
c8621200("8621200","陇南市"),
c8622900("8622900","临夏回族自治州"),
c8623000("8623000","甘南藏族自治州"),
c8630100("8630100","西宁市"),
c8632100("8632100","海东地区"),
c8632200("8632200","海北藏族自治州"),
c8632300("8632300","黄南藏族自治州"),
c8632500("8632500","海南藏族自治州"),
c8632600("8632600","果洛藏族自治州"),
c8632700("8632700","玉树藏族自治州"),
c8632800("8632800","海西蒙古族藏族自治州"),
c8640100("8640100","银川市"),
c8640200("8640200","石嘴山市"),
c8640300("8640300","吴忠市"),
c8640400("8640400","固原市"),
c8640500("8640500","中卫市"),
c8650100("8650100","乌鲁木齐市"),
c8650200("8650200","克拉玛依市"),
c8652100("8652100","吐鲁番地区"),
c8652200("8652200","哈密地区"),
c8652300("8652300","昌吉回族自治州"),
c8652700("8652700","博尔塔拉蒙古自治州"),
c8652800("8652800","巴音郭楞蒙古自治州"),
c8652900("8652900","阿克苏地区"),
c8653000("8653000","克孜勒苏柯尔克孜自治州"),
c8653100("8653100","喀什地区"),
c8653200("8653200","和田地区"),
c8654000("8654000","伊犁哈萨克自治州"),
c8654200("8654200","塔城地区"),
c8654300("8654300","阿勒泰地区"),
c8659000("8659000","自治区直辖县级行政区划");
private String city;
private String code;
CityCode(String city, String code) {
this.city = city;
this.code = code;
}
String getCode() {
return this.code;
}
String getCity() {
return this.code;
}
public static String getCodeByCity(String city) {
CityCode[] values = CityCode.values();
for(CityCode value : values) {
if (value.city.equals(city)) {
return value.code;
}
}
return "";
}
}
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -9,6 +9,7 @@ import com.winsun.bean.Order; ...@@ -9,6 +9,7 @@ import com.winsun.bean.Order;
import com.winsun.bean.Package; import com.winsun.bean.Package;
import com.winsun.bean.School; import com.winsun.bean.School;
import com.winsun.bean.SysUser; import com.winsun.bean.SysUser;
import com.winsun.common.CityCode;
import com.winsun.constant.OrderStatus; import com.winsun.constant.OrderStatus;
import com.winsun.constant.UserType; import com.winsun.constant.UserType;
import com.winsun.mapper.*; import com.winsun.mapper.*;
...@@ -402,8 +403,8 @@ public class PackageNewClothes { ...@@ -402,8 +403,8 @@ public class PackageNewClothes {
* @return * @return
*/ */
@RequestMapping(value = "XiaoBaiCard", method = RequestMethod.POST) @RequestMapping(value = "XiaoBaiCard", method = RequestMethod.POST)
public ResponseData<String> XiaoBaiCard(@RequestParam("contactNumber") String contactNumber, @RequestParam(value = "site", required = false) String site public ResponseData<String> XiaoBaiCard(@RequestParam("contactNumber") String contactNumber, @RequestParam("site") String site
, @RequestParam("studentCard") String studentCard, @RequestParam("cardId") String cardId, @RequestParam(value = "addRess", required = false) String addRess , @RequestParam("studentCard") String studentCard, @RequestParam("cardId") String cardId, @RequestParam("address") String address
, @RequestParam("customerName") String customerName, @RequestParam("partner") String partner, @RequestParam("businessNumber") String businessNumber , @RequestParam("customerName") String customerName, @RequestParam("partner") String partner, @RequestParam("businessNumber") String businessNumber
, @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin , @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh", required = false) String isFromRh) { , @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh", required = false) String isFromRh) {
...@@ -460,8 +461,18 @@ public class PackageNewClothes { ...@@ -460,8 +461,18 @@ public class PackageNewClothes {
*/ */
JSONObject jsonObject = null; JSONObject jsonObject = null;
try { try {
String[] sites = site.split("/");
String shi = "";
if (sites.length >= 2) {
shi = sites[1];
}else{
return ResponseData.error("请选择邮寄地区");
}
// 根据市获取编号
jsonObject = XbkUtil.xbkOrderJT0002(businessNumber, idCard, jsonObject = XbkUtil.xbkOrderJT0002(businessNumber, idCard,
customerName, contactNumber, xbId, netId); customerName, contactNumber, xbId, netId, CityCode.getCodeByCity(shi), address);
} catch (Exception e) { } catch (Exception e) {
log.error("小白卡下单接口调用异常", e.getMessage()); log.error("小白卡下单接口调用异常", e.getMessage());
} }
...@@ -491,8 +502,8 @@ public class PackageNewClothes { ...@@ -491,8 +502,8 @@ public class PackageNewClothes {
if(StringUtils.isNotBlank(site)){ if(StringUtils.isNotBlank(site)){
order.setSite(site); order.setSite(site);
} }
if(StringUtils.isNotBlank(addRess)){ if(StringUtils.isNotBlank(address)){
order.setAddress(addRess); order.setAddress(address);
} }
String orderNum = "YRYM" + ProduceIdUtil.getId(); String orderNum = "YRYM" + ProduceIdUtil.getId();
order.setKapin(kapin); order.setKapin(kapin);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment