Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -563,6 +563,8 @@ public class PayOrderLogic {
 
         } catch (Exception e) {
             log.error(workerOrder.getOrderId() + " 师傅配件扣自有库存失败: ", e);
+            throw new RemoteServiceException("师傅辅材扣库存失败,没有库存");
+
         }
 
         // 辅材扣库存
@@ -578,6 +580,7 @@ public class PayOrderLogic {
             }
         } catch (Exception e) {
             log.error(workerOrder.getOrderId() + " 师傅辅材扣库存失败: ", e);
+            throw new RemoteServiceException("师傅辅材扣库存失败,没有库存");
         }