修改代码

pz-system/src/main/java/com/pz/system/service/impl/TotalOrderServiceImpl.java

@@ -506,12 +506,12 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         } else if (bo.getBusinessId() == 0) {// 商城订单
         } else if (bo.getBusinessId() == 0) {// 商城订单
 
 
             StoreOrder storeOrder = BeanUtil.toBean(bo, StoreOrder.class);
             StoreOrder storeOrder = BeanUtil.toBean(bo, StoreOrder.class);
-
             StoreGoods storeGoods1 = storeGoodsMapper.selectById(storeOrder.getGoodsId());
             StoreGoods storeGoods1 = storeGoodsMapper.selectById(storeOrder.getGoodsId());
             if (storeGoods1.getInventory() == 0) {
             if (storeGoods1.getInventory() == 0) {
                 throw new ServiceException("商品库存不足！");
                 throw new ServiceException("商品库存不足！");
             }
             }
 
 
+            storeOrder.setStoreId(storeGoods1.getStoreId());
             // 扣除库存
             // 扣除库存
             storeGoods1.setId(storeOrder.getId());
             storeGoods1.setId(storeOrder.getId());
             storeGoods1.setInventory(storeGoods1.getInventory() - storeOrder.getNum());
             storeGoods1.setInventory(storeGoods1.getInventory() - storeOrder.getNum());
@@ -561,7 +561,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         if (totalOrder.getBusinessId() == 5
         if (totalOrder.getBusinessId() == 5
             && totalOrder.getStatus() == 1
             && totalOrder.getStatus() == 1
             && sonOrderSimpleDataByTotalId.getOrderStatus() == 1
             && sonOrderSimpleDataByTotalId.getOrderStatus() == 1
-            ) {
+        ) {
             totalOrderBo.setIsRefund(0);
             totalOrderBo.setIsRefund(0);
             return this.refundOrder(totalOrderBo);
             return this.refundOrder(totalOrderBo);
         }
         }
@@ -729,7 +729,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         boolean sonOrderFlag = orderService.switchSonOrderStatus(totalOrder.getId(), CommonOrderStatus.REFUND.getCode());
         boolean sonOrderFlag = orderService.switchSonOrderStatus(totalOrder.getId(), CommonOrderStatus.REFUND.getCode());
 
 
         //除了商城订单和诊前挂号不需要给陪诊员和商户分成
         //除了商城订单和诊前挂号不需要给陪诊员和商户分成
-        if(totalOrder.getBusinessId() != 0 && totalOrder.getBusinessId() != 6 && totalOrder.getStatus() == 2) {
+        if (totalOrder.getBusinessId() != 0 && totalOrder.getBusinessId() != 6 && totalOrder.getStatus() == 2) {
             Services services = servicesMapper.selectById(totalOrder.getServiceId());
             Services services = servicesMapper.selectById(totalOrder.getServiceId());
             if (services.getFenmo() != 0) {
             if (services.getFenmo() != 0) {
                 double money = 0;
                 double money = 0;
@@ -793,7 +793,7 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         if (null == sonOrderSimpleDataByTotalId) {
         if (null == sonOrderSimpleDataByTotalId) {
             throw new ServiceException("子订单状态出错!");
             throw new ServiceException("子订单状态出错!");
         }
         }
-        int IsRefund = getIsRefund(totalOrder.getBusinessId(),totalOrder.getStatus(),sonOrderSimpleDataByTotalId.getSonOrderId());
+        int IsRefund = getIsRefund(totalOrder.getBusinessId(), totalOrder.getStatus(), sonOrderSimpleDataByTotalId.getSonOrderId());
         // 订单退款金额
         // 订单退款金额
         double money = 0;
         double money = 0;
 
 
@@ -1188,13 +1188,13 @@ public class TotalOrderServiceImpl implements ITotalOrderService {
         return money;
         return money;
     }
     }
 
 
-    public int getIsRefund(int businessId,int businessStatus,int ServiceStatus){
+    public int getIsRefund(int businessId, int businessStatus, int ServiceStatus) {
         int IsRefund = 0;
         int IsRefund = 0;
-        if((businessStatus == 1 && ServiceStatus == 0) || (businessStatus == 1 && ServiceStatus == 1)){
+        if ((businessStatus == 1 && ServiceStatus == 0) || (businessStatus == 1 && ServiceStatus == 1)) {
             IsRefund = 0;
             IsRefund = 0;
-        }else if(businessStatus == 2 && ServiceStatus == 2){
+        } else if (businessStatus == 2 && ServiceStatus == 2) {
             IsRefund = 1;
             IsRefund = 1;
-        }else if(businessId == 3 && businessStatus == 1 && ServiceStatus == 2){
+        } else if (businessId == 3 && businessStatus == 1 && ServiceStatus == 2) {
             IsRefund = 1;
             IsRefund = 1;
         }
         }
         return IsRefund;
         return IsRefund;