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

mec-biz/src/main/java/com/ym/mec/biz/service/impl/StudentRepairServiceImpl.java

@@ -757,7 +757,10 @@ public class StudentRepairServiceImpl extends BaseServiceImpl<Integer, StudentRe
                 goodsIds.add(e.getGoodsId());
             }
         });
-        AccountType accountType = sysPaymentConfigService.checkAccountType(PaymentChannelEnum.valueOf(orderByOrderNo.getPaymentChannel()), orderByOrderNo.getMerNos());
+        AccountType accountType = AccountType.INTERNAL;
+        if(StringUtils.isNotEmpty(orderByOrderNo.getPaymentChannel())){
+            accountType = sysPaymentConfigService.checkAccountType(PaymentChannelEnum.valueOf(orderByOrderNo.getPaymentChannel()), orderByOrderNo.getMerNos());
+        }
         //实际扣减的库存商品
         List<SellOrder> sellOrderList = goodsService.subtractStock(goodsIds, accountType);
         Map<String, BigDecimal> costMap = new HashMap<>(2);