增加中通打印。

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/salesOrderMapper.xml

@@ -269,6 +269,9 @@
                 <if test="isSelectCustomer !=null and isSelectCustomer !='' and isSelectCustomer == 2 ">
                     soi.sales_batch_id != 'KS00000000000001'
                 </if>
+                <if test="salesVestId !=null">
+                    AND sales_vest_id = #{salesVestId}
+                </if>
                 <if test="salesIsDownload !=null and salesIsDownload !=''">
                     AND sales_is_download = #{salesIsDownload}
                 </if>

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

@@ -594,11 +594,6 @@ public class AwaitSendController {
             eOrderRequestData.Quantity = 1;
         }
 
-        if (true) {
-            ResponseJson responseJson = tbPrintOrder(salesOrderInfo, eOrderRequestData);
-            return responseJson;
-        }
-
         JSONObject jsonObject = null;
         try {
             // 向第三方系统【快递鸟】提交订单数据，第三方系统会检测订单是否重复
@@ -660,7 +655,7 @@ public class AwaitSendController {
             String goodName = ctrOrderProduct(salesOrderInfo);
             if("jd".equalsIgnoreCase(salesOrderInfo.getSalesPostFirm())){
                 jsonObject.put("PrintTemplate",jsonObject.get("PrintTemplate").toString().replace(salesId.toString(), "<font style=\"font-size:6px\">"+goodName+"</font>"));
-            } else if("sto".equalsIgnoreCase(salesOrderInfo.getSalesPostFirm())) {
+            } else if("sto".equalsIgnoreCase(salesOrderInfo.getSalesPostFirm()) || "zto".equalsIgnoreCase(salesOrderInfo.getSalesPostFirm())) {
                 jsonObject.put("PrintTemplate",jsonObject.get("PrintTemplate").toString().replace(salesId.toString(), goodName));
             }else{
                 if ("sf".equalsIgnoreCase(salesOrderInfo.getSalesPostFirm())) {