Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-core/src/main/java/com.iamberry.rst.core/order/EOrderRequestData.java

@@ -1,5 +1,7 @@
 package com.iamberry.rst.core.order;
 
+import com.alibaba.fastjson.annotation.JSONField;
+
 import java.io.Serializable;
 import java.util.List;
 import java.util.Map;
@@ -12,285 +14,60 @@ import java.util.Map;
  * @website www.iamberry.com
  */
 public class EOrderRequestData implements Serializable {
-
     // 用户自定义回调信息
-    private String CallBack;
+    public String CallBack;
     // 会员标识
-    private String MemberID;
+    public String MemberID;
     // 电子面单客户账号
-    private String CustomerName;
+    public String CustomerName;
     // 电子面单密码
-    private String CustomerPwd;
+    public String CustomerPwd;
     // 收件网点标识
-    private String SendSite;
+    public String SendSite;
     // 快递公司编码
-    private String ShipperCode;
+    public String ShipperCode;
     // 快递单号
-    private String LogisticCode;
+    public String LogisticCode;
     // 订单编号
-    private String OrderCode;
+    public String OrderCode;
     // 第三方订单编号
-    private String ThrOrderCode;
+    public String ThrOrderCode;
     // 月结编码
-    private String MonthCode;
+    public String MonthCode;
     // 邮费支付方式:1-现付，2-到付，3-月结，4-第三方支付
-    private Integer PayType;
+    public Integer PayType;
     // 快递类型：1-标准快件
-    private String ExpType;
+    public String ExpType;
     // 是否通知快递员上门揽件：0-通知；1-不通知；不填则默认为1
-    private Integer IsNotice;
+    public Integer IsNotice;
     // 寄件费（运费）
-    private Double Cost;
+    public Double Cost;
     // 其他费用
-    private Double OtherCost;
+    public Double OtherCost;
     // 收件人信息
-    private Map<String, Object> Receiver;
+    public Map<String, Object> Receiver;
     // 发件人信息
-    private Map<String, Object> Sender;
+    public Map<String, Object> Sender;
     // 上门取货开始时间
-    private String StartDate;
+    public String StartDate;
     // 上门取货结束时间
-    private String EndDate;
+    public String EndDate;
     // 物品总重（KG）
-    private Double Weight;
+    public Double Weight;
     // 件数
-    private Integer Quantity;
+    public Integer Quantity;
     // 物品总体积m3
-    private Double Volume;
+    public Double Volume;
     // 备注
-    private String Remark;
+    public String Remark;
     // 增值服务
-    private Map<String, Object> AddService;
+    public Map<String, Object> AddService;
     // 寄件产品明细
-    private List<Map<String, Object>> Commodity;
+    public List<Map<String, Object>> Commodity;
     // 返回电子面单模板：0-不需要；1-需要
-    private Integer IsReturnPrintTemplate;
+    public Integer IsReturnPrintTemplate;
     // 是否订阅短信：0-不需要；1-需要
-    private Integer IsSendMessage;
+    public Integer IsSendMessage;
     // 模板规格(默认的模板无需传值，非默认模板传对应模板尺寸)
-    private String TemplateSize;
-
-    public String getCallBack() {
-        return CallBack;
-    }
-
-    public void setCallBack(String callBack) {
-        CallBack = callBack;
-    }
-
-    public String getMemberID() {
-        return MemberID;
-    }
-
-    public void setMemberID(String memberID) {
-        MemberID = memberID;
-    }
-
-    public String getCustomerName() {
-        return CustomerName;
-    }
-
-    public void setCustomerName(String customerName) {
-        CustomerName = customerName;
-    }
-
-    public String getCustomerPwd() {
-        return CustomerPwd;
-    }
-
-    public void setCustomerPwd(String customerPwd) {
-        CustomerPwd = customerPwd;
-    }
-
-    public String getSendSite() {
-        return SendSite;
-    }
-
-    public void setSendSite(String sendSite) {
-        SendSite = sendSite;
-    }
-
-    public String getShipperCode() {
-        return ShipperCode;
-    }
-
-    public void setShipperCode(String shipperCode) {
-        ShipperCode = shipperCode;
-    }
-
-    public String getLogisticCode() {
-        return LogisticCode;
-    }
-
-    public void setLogisticCode(String logisticCode) {
-        LogisticCode = logisticCode;
-    }
-
-    public String getOrderCode() {
-        return OrderCode;
-    }
-
-    public void setOrderCode(String orderCode) {
-        OrderCode = orderCode;
-    }
-
-    public String getThrOrderCode() {
-        return ThrOrderCode;
-    }
-
-    public void setThrOrderCode(String thrOrderCode) {
-        ThrOrderCode = thrOrderCode;
-    }
-
-    public String getMonthCode() {
-        return MonthCode;
-    }
-
-    public void setMonthCode(String monthCode) {
-        MonthCode = monthCode;
-    }
-
-    public Integer getPayType() {
-        return PayType;
-    }
-
-    public void setPayType(Integer payType) {
-        PayType = payType;
-    }
-
-    public String getExpType() {
-        return ExpType;
-    }
-
-    public void setExpType(String expType) {
-        ExpType = expType;
-    }
-
-    public Integer getIsNotice() {
-        return IsNotice;
-    }
-
-    public void setIsNotice(Integer isNotice) {
-        IsNotice = isNotice;
-    }
-
-    public Double getCost() {
-        return Cost;
-    }
-
-    public void setCost(Double cost) {
-        Cost = cost;
-    }
-
-    public Double getOtherCost() {
-        return OtherCost;
-    }
-
-    public void setOtherCost(Double otherCost) {
-        OtherCost = otherCost;
-    }
-
-    public Map<String, Object> getReceiver() {
-        return Receiver;
-    }
-
-    public void setReceiver(Map<String, Object> receiver) {
-        Receiver = receiver;
-    }
-
-    public Map<String, Object> getSender() {
-        return Sender;
-    }
-
-    public void setSender(Map<String, Object> sender) {
-        Sender = sender;
-    }
-
-    public String getStartDate() {
-        return StartDate;
-    }
-
-    public void setStartDate(String startDate) {
-        StartDate = startDate;
-    }
-
-    public String getEndDate() {
-        return EndDate;
-    }
-
-    public void setEndDate(String endDate) {
-        EndDate = endDate;
-    }
-
-    public Double getWeight() {
-        return Weight;
-    }
-
-    public void setWeight(Double weight) {
-        Weight = weight;
-    }
-
-    public Integer getQuantity() {
-        return Quantity;
-    }
-
-    public void setQuantity(Integer quantity) {
-        Quantity = quantity;
-    }
-
-    public Double getVolume() {
-        return Volume;
-    }
-
-    public void setVolume(Double volume) {
-        Volume = volume;
-    }
-
-    public String getRemark() {
-        return Remark;
-    }
-
-    public void setRemark(String remark) {
-        Remark = remark;
-    }
-
-    public Map<String, Object> getAddService() {
-        return AddService;
-    }
-
-    public void setAddService(Map<String, Object> addService) {
-        AddService = addService;
-    }
-
-    public Integer getIsReturnPrintTemplate() {
-        return IsReturnPrintTemplate;
-    }
-
-    public void setIsReturnPrintTemplate(Integer isReturnPrintTemplate) {
-        IsReturnPrintTemplate = isReturnPrintTemplate;
-    }
-
-    public Integer getIsSendMessage() {
-        return IsSendMessage;
-    }
-
-    public void setIsSendMessage(Integer isSendMessage) {
-        IsSendMessage = isSendMessage;
-    }
-
-    public String getTemplateSize() {
-        return TemplateSize;
-    }
-
-    public void setTemplateSize(String templateSize) {
-        TemplateSize = templateSize;
-    }
-
-    public List<Map<String, Object>> getCommodity() {
-        return Commodity;
-    }
-
-    public void setCommodity(List<Map<String, Object>> commodity) {
-        Commodity = commodity;
-    }
+    public String TemplateSize;
 }

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AwaitSendController.java

@@ -184,31 +184,31 @@ public class AwaitSendController {
          * 组装数据
          */
         EOrderRequestData eOrderRequestData = new EOrderRequestData();
-        eOrderRequestData.setShipperCode(post);
-        eOrderRequestData.setOrderCode(orderId);
-        eOrderRequestData.setPayType(3);
-        eOrderRequestData.setExpType("1");
-        eOrderRequestData.setCost(0.00);
-        eOrderRequestData.setOtherCost(0.0);
+        eOrderRequestData.ShipperCode = (post);
+        eOrderRequestData.OrderCode = (orderId);
+        eOrderRequestData.PayType = (3);
+        eOrderRequestData.ExpType = ("1");
+        eOrderRequestData.Cost = (0.00);
+        eOrderRequestData.OtherCost = (0.0);
 
         // 不同的快递公司需要做不同的处理
         if (post.equalsIgnoreCase("EMS")) {
             // 省内EMS
-            eOrderRequestData.setCustomerName("90000009971400");
-            eOrderRequestData.setCustomerPwd("90000009971400");
+            eOrderRequestData.CustomerName = ("90000009971400");
+            eOrderRequestData.CustomerPwd = ("90000009971400");
         } else if (post.equalsIgnoreCase("SF")) {
             // 顺丰
-            eOrderRequestData.setMonthCode("7690035114");
+            eOrderRequestData.MonthCode = ("7690035114");
         } else if (post.equalsIgnoreCase("YZBK")) {
             // 省外EMS (无需操作)
         } else if (post.equalsIgnoreCase("STO")) {
             // 申通快递
-            eOrderRequestData.setCustomerName("爱贝源");
-            eOrderRequestData.setCustomerPwd("Iamberry321.");
-            eOrderRequestData.setSendSite("广东东莞公司");
+            eOrderRequestData.CustomerName = ("爱贝源");
+            eOrderRequestData.CustomerPwd = ("Iamberry321.");
+            eOrderRequestData.SendSite = ("广东东莞公司");
         } else if (post.equalsIgnoreCase("DBL")) {
             //德邦
-            eOrderRequestData.setCustomerName("651476854");
+            eOrderRequestData.CustomerName = ("651476854");
         }
         // 收件人信息
         String[] addrs = salesOrderInfo.getSalesAddressInfo().split("-");
@@ -233,7 +233,7 @@ public class AwaitSendController {
         Receiver.put("ExpAreaName", addrs[2]);
         Receiver.put("Address", salesOrderInfo.getSalesAddressInfo());
         Receiver.put("PostCode", PostCode);
-        eOrderRequestData.setReceiver(Receiver);
+        eOrderRequestData.Receiver = (Receiver);
         // 发件人信息
         Map<String, Object> Sender = new HashMap<String, Object>();
         Sender.put("Name", storeShip.getStoreShipName());
@@ -243,7 +243,7 @@ public class AwaitSendController {
         Sender.put("ExpAreaName", "清溪镇");
         Sender.put("Address", storeShip.getStoreShipAddress());
         Sender.put("PostCode", "523660");
-        eOrderRequestData.setSender(Sender);
+        eOrderRequestData.Sender = (Sender);
         // 产品信息
         List<Map<String, Object>> Commodity = new ArrayList<>();
         SalesOrderItem item = new SalesOrderItem();
@@ -267,11 +267,10 @@ public class AwaitSendController {
         product1.put("GoodsWeight", colorIsWeight/1000);
         Commodity.add(product1);
 
-        eOrderRequestData.setCommodity(Commodity);
-        eOrderRequestData.setWeight(colorIsWeight/1000);
-        eOrderRequestData.setQuantity(1);
-        eOrderRequestData.setIsReturnPrintTemplate(1);
-
+        eOrderRequestData.Commodity = (Commodity);
+        eOrderRequestData.Weight = (colorIsWeight/1000);
+        eOrderRequestData.Quantity = (1);
+        eOrderRequestData.IsReturnPrintTemplate = (1);
         try {
             String json = OrderUtils.orderOnlineByJson(eOrderRequestData);
             JSONObject jsonObject = JSONObject.parseObject(json);
@@ -314,6 +313,7 @@ public class AwaitSendController {
             }
             return ResponseJson.getSUCCESS().addResponseKeyValue("json", json);
         } catch (Exception e) {
+            LOGGER.error("", e);
             return ResponseJson.getFAILURE().addResponseKeyValue("error", e.getMessage());
         }
     }