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

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

@@ -16,6 +16,8 @@ import com.iamberry.wechat.tools.AddrUtil;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.ResponseJson;
 import com.iamberry.wechat.tools.UUIDGenerator;
+import com.iamberry.wechat.tools.payUtil.StringUtil;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -256,7 +258,7 @@ public class AwaitSendController {
             }
             Goodsquantity += temp.getItemNum();
         }
-        String uuid = UUIDGenerator.getUUID();
+        String uuid = UUIDGenerator.getUUID().substring(0, 10);
         Map<String, Object> product1 = new HashMap<String, Object>();
         product1.put("GoodsName", uuid);
         product1.put("Goodsquantity", Goodsquantity);

watero-rst-web/src/main/java/com/iamberry/rst/utils/OrderUtils.java

@@ -32,7 +32,7 @@ public class OrderUtils {
     // 正式环境地址：http://api.kdniao.cc/api/Eorderservice
     // 测试环境地址：http://testapi.kdniao.cc:8081/api/EOrderService
     private static final String ReqURL="http://api.kdniao.cc/api/Eorderservice";
-    //private static final String ReqURL="http://testapi.kdniao.cc:8081/api/EOrderService";
+//    private static final String ReqURL="http://testapi.kdniao.cc:8081/api/EOrderService";
 
     public static void main(String[] args) throws Exception {
         EOrderRequestData eOrderRequestData = new EOrderRequestData();

watero-rst-web/src/main/webapp/WEB-INF/views/order/salesOrder/print_order.ftl

@@ -154,21 +154,34 @@
                     $(order.find("td")[0]).html("<span style='color: rgba(243, 123, 29, 1);'>处理中</span>");
                 },
                 success: function(data){
-                    // 请求成功
-                    var res = $.parseJSON(data.returnMsg.json);
-                    if (data.resultMsg && res.Success) {
-                        var html = res.PrintTemplate;
-                        LODOP.PRINT_INIT('打印订单');
-                        LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
-                        LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", html);
-                        var flag = LODOP.PRINT();
-                        $(order.find("td")[0]).html("<span style='color: blue'>打印完成</span>");
-                        if (flag) {
+                    if (data.error) {
+                        // 捕获系统级的错误(比如因为空指针抛出的Exception)
+                        $(order.find("td")[0]).html("<span style='color: red;'>失败(" + data.error + ")</span>");
+                        startPrint();
+                    } else {
+                        console.log(data)
+                        if (data && data.returnCode && data.returnCode != 200) {
+                            // 捕获业务级的操作（如订单的店铺没有绑定发货人信息）
+                            $(order.find("td")[0]).html("<span style='color: red;'>失败(" + data.resultMsg.error + ")</span>");
                             startPrint();
+                        } else {
+                            var res = $.parseJSON(data.returnMsg.json);
+                            if (data.resultMsg && res.Success) {
+                                var html = res.PrintTemplate;
+                                LODOP.PRINT_INIT('打印订单');
+                                LODOP.SET_PRINT_PAGESIZE(0, 0, 0,"");
+                                LODOP.ADD_PRINT_HTM("0mm","0mm","100%","100%", html);
+                                var flag = LODOP.PRINT();
+                                $(order.find("td")[0]).html("<span style='color: blue'>打印完成</span>");
+                                if (flag) {
+                                    startPrint();
+                                }
+                            } else {
+                                // 第三方接口错误
+                                $(order.find("td")[0]).html("<span style='color: red;'>失败(" + res.Reason + ")</span>");
+                                startPrint();
+                            }
                         }
-                    } else {
-                        $(order.find("td")[0]).html("<span style='color: red;'>失败(" + res.Reason + ")</span>");
-                        startPrint();
                     }
                 }
             });