修改小白卡接口参数

common/src/main/java/com/winsun/utils/XbkUtil.java

@@ -31,8 +31,10 @@ public class XbkUtil {
         mapParm.put("param", map);
         JSONObject json = new JSONObject(mapParm);
         JSONObject jsonObject = null;
+        log.info(json.toJSONString());
         try {
             jsonObject = HttpHelper.doPost("http://enter.gd189.cn/o2oweb/outMain/service.do", json.toString());
+            log.info(jsonObject.toJSONString());
         }catch (Exception e){
             log.error(type+"调取接口异常",e.getMessage());
         }
@@ -51,12 +53,15 @@ public class XbkUtil {
      * @return
      */
     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.put("prodId", xbId);
         map.put("coUserId", netId);
         map.put("phoneNumber", businessNumber);
         map.put("isDelivery", "1");
+        map.put("sendCityCode", sendCityCode);
+        map.put("custAffress", custAffress);
         map.put("custName", customerName);
         map.put("idCardNo", idCard);
         map.put("contactNumber", contactNumber);

new-user/src/main/java/com/winsun/controller/PackageNewClothes.java

@@ -9,6 +9,7 @@ import com.winsun.bean.Order;
 import com.winsun.bean.Package;
 import com.winsun.bean.School;
 import com.winsun.bean.SysUser;
+import com.winsun.common.CityCode;
 import com.winsun.constant.OrderStatus;
 import com.winsun.constant.UserType;
 import com.winsun.mapper.*;
@@ -402,8 +403,8 @@ public class PackageNewClothes {
      * @return
      */
     @RequestMapping(value = "XiaoBaiCard", method = RequestMethod.POST)
-    public ResponseData<String> XiaoBaiCard(@RequestParam("contactNumber") String contactNumber, @RequestParam(value = "site", required = false) String site
-            , @RequestParam("studentCard") String studentCard, @RequestParam("cardId") String cardId, @RequestParam(value = "addRess", required = false) String addRess
+    public ResponseData<String> XiaoBaiCard(@RequestParam("contactNumber") String contactNumber, @RequestParam("site") String site
+            , @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(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) {
@@ -460,8 +461,18 @@ public class PackageNewClothes {
          */
         JSONObject jsonObject = null;
         try {
+
+            String[] sites = site.split("/");
+            String shi = "";
+            if (sites.length >= 2) {
+                shi = sites[1];
+            }else{
+                return ResponseData.error("请选择邮寄地区");
+            }
+
+            // 根据市获取编号
             jsonObject = XbkUtil.xbkOrderJT0002(businessNumber, idCard,
-                    customerName, contactNumber, xbId, netId);
+                    customerName, contactNumber, xbId, netId, CityCode.getCodeByCity(shi), address);
         } catch (Exception e) {
             log.error("小白卡下单接口调用异常", e.getMessage());
         }
@@ -491,8 +502,8 @@ public class PackageNewClothes {
         if(StringUtils.isNotBlank(site)){
             order.setSite(site);
         }
-        if(StringUtils.isNotBlank(addRess)){
-            order.setAddress(addRess);
+        if(StringUtils.isNotBlank(address)){
+            order.setAddress(address);
         }
         String orderNum = "YRYM" + ProduceIdUtil.getId();
         order.setKapin(kapin);