Skip to content

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

修改小白卡接口参数

parent 588e01ef
Showing with 22 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/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