Merge remote-tracking branch 'origin/feature-201831-wangcz' into feature-201831-wangcz

src/main/java/com/uas/platform/b2c/trade/order/service/impl/OrderServiceImpl.java

@@ -1750,19 +1750,19 @@ public class OrderServiceImpl implements OrderService {
     @Override
     public ResultMap ensureOrderAccept(Long id, String invoiceId) {
         if (id == null && StringUtils.isEmpty(invoiceId)) {
-            throw new IllegalOperatorException("传入的订单信息和出货单信息都为空");
+            return new ResultMap(CodeType.ERROR_STATE, "传入的订单信息和出货单信息都为空");
         }
         Order order = null;
         if (id == null) {
             Invoice invoice = invoiceService.getInvoice(invoiceId);
-            if (invoice == null){
-                throw new IllegalOperatorException("找不到指定的出货单信息");
+            if (invoice == null) {
+                return new ResultMap(CodeType.NO_INFO, "找不到指定的出货单信息");
             }
             order = getOrderByOrderIdOrId(invoice.getOrderId(), invoice.getOrid());
             if (order == null) {
                 Purchase purchase = purchaseService.getPurchaseByPurchaseidOrId(invoice.getPurchaseid(), invoice.getPuid());
-                if (purchase == null){
-                    throw new IllegalOperatorException("找不到销售单信息");
+                if (purchase == null) {
+                    return new ResultMap(CodeType.NO_INFO, "找不到销售单信息");
                 }
                 order = getOrderByOrderIdOrId(null, purchase.getOrderid());
             }
@@ -1774,7 +1774,10 @@ public class OrderServiceImpl implements OrderService {
         }
         // 第一步 对发货单确认收货, 采购入库
         if (!StringUtils.isEmpty(invoiceId)) {
-            invoiceSignReceive(order, invoiceId);
+            ResultMap resultMap = invoiceSignReceive(order, invoiceId);
+            if (resultMap.getCode() != CodeType.OK.code()) {
+                return resultMap;
+            }
         } else {
             String inIds = order.getInIds();
             if (StringUtils.isEmpty(inIds)) {
@@ -1782,7 +1785,10 @@ public class OrderServiceImpl implements OrderService {
             }
             String[] invoiceids = inIds.split(SplitChar.COMMA);
             for (String inid : invoiceids) {
-                invoiceSignReceive(order, inid);
+                ResultMap resultMap = invoiceSignReceive(order, inid);
+                if (resultMap.getCode() != CodeType.OK.code()) {
+                    return resultMap;
+                }
             }
         }
         if (NumberUtil.compare(order.getQty(), order.getSignReceiveQty()) > 0) {
@@ -1814,7 +1820,7 @@ public class OrderServiceImpl implements OrderService {
         //不是优软代售
         for (Purchase purchase : purchases) {
             if ((purchase.getStatus().intValue() != Status.INBOUND.value()) && (purchase.getStatus().intValue() != Status.RECEIVED.value())) {
-                throw new IllegalOperatorException("订单关联的采购单：" + purchase.getPurchaseid() + ",状态异常："
+                return new ResultMap(CodeType.ERROR_STATE, "订单关联的采购单：" + purchase.getPurchaseid() + ",状态异常："
                         + Status.valueOf(purchase.getStatus()).getPhrase());
             }