订单详情修改

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java

@@ -21,7 +21,6 @@ import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
-import com.xxfc.platform.activity.entity.ActivityProduct;
 import com.xxfc.platform.activity.entity.ActivityProductSpecs;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
@@ -779,16 +778,6 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 
 						}
 					}
-
-					//修改规格库存
-					activityProductSpecs.setSales(activeDetail.getNumber());
-					activityFeign.update(activityProductSpecs);
-
-					//修改商品库存
-					ActivityProduct activityProduct = new ActivityProduct();
-					activityProduct.setId(activityProductSpecs.getGoodsId());
-					activityProduct.setSales(activeDetail.getNumber());
-					activityFeign.updateProduct(activityProduct);
 				}
 			}
 

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java

@@ -3,12 +3,13 @@ package com.xxfc.platform.order.biz.inner;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.util.StrUtil;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.AppUserDTO;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.xxfc.platform.activity.entity.ActivityProduct;
+import com.xxfc.platform.activity.entity.ActivityProductSpecs;
 import com.xxfc.platform.activity.feign.ActivityFeign;
 import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.contant.enumerate.*;
@@ -68,6 +69,9 @@ public class OrderCancelBiz {
     @Autowired
     OrderRentVehicleBiz orderRentVehicleBiz;
 
+    @Autowired
+    OrderActivityDetailBiz orderActivityDetailBiz;
+
     @Autowired
     OrderMsgBiz orderMsgBiz;
 
@@ -109,6 +113,9 @@ public class OrderCancelBiz {
         cancelAble.put(OrderTypeEnum.MEMBER.getCode(), new LinkedList<Integer>(){{
             add(OrderStatusEnum.ORDER_UNPAY.getCode());
         }});
+        cancelAble.put(OrderTypeEnum.ACTIVITY.getCode(), new LinkedList<Integer>(){{
+            add(OrderStatusEnum.ORDER_UNPAY.getCode());
+        }});
     }
 
     /**
@@ -117,9 +124,11 @@ public class OrderCancelBiz {
      */
     @Transactional
     public void cancel(BaseOrder baseOrder, BigDecimal changeViolateAmount) {
+        //三类型订单详情
         OrderRentVehicleDetail orvd = new OrderRentVehicleDetail();
         OrderTourDetail otd = new OrderTourDetail();
         OrderMemberDetail omd = new OrderMemberDetail();
+        OrderActiveDetail orderActiveDetail = new OrderActiveDetail();
         if(cancelAble.get(baseOrder.getType()).contains(baseOrder.getStatus())) {
             BaseOrder updateOrder = new BaseOrder(){{
                 setId(baseOrder.getId());
@@ -127,7 +136,7 @@ public class OrderCancelBiz {
                 setCancelReason(baseOrder.getCancelReason());
                 setVersion(baseOrder.getVersion());
             }};
-            BeanUtils.copyProperties(baseOrderBiz.updateSelectiveByIdReT(updateOrder), baseOrder);;
+            BeanUtils.copyProperties(baseOrderBiz.updateSelectiveByIdReT(updateOrder), baseOrder);
             InProgressVO inProgressVO = null;
             OrderAccountDetail oad = new OrderAccountDetail();
 
@@ -374,6 +383,24 @@ public class OrderCancelBiz {
 
                 //增加库存
                 tourFeign.stock(otd.getSpePriceId(), otd.getTotalNumber(), TourFeign.STOCK_PLUS);
+            } else if(OrderTypeEnum.ACTIVITY.getCode().equals(baseOrder.getType())) {//活动订单
+                orderActiveDetail = orderActivityDetailBiz.getOne(baseOrder.getId());
+                //增加库存
+                if(orderActiveDetail != null) {
+                    ActivityProductSpecs activityProductSpecs = activityFeign.get(orderActiveDetail.getSpecsId()).getData();
+                    if (activityProductSpecs != null) {
+                        //修改规格库存
+                        activityProductSpecs.setSales(orderActiveDetail.getNumber());
+                        activityFeign.update(activityProductSpecs);
+                        //修改商品库存
+                        ActivityProduct activityProduct = new ActivityProduct();
+                        activityProduct.setId(activityProductSpecs.getGoodsId());
+                        activityProduct.setSales(orderActiveDetail.getNumber());
+                        activityFeign.updateProduct(activityProduct);
+                    }
+
+                }
+
             }
 
             //返还优惠券

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderActivityService.java

@@ -2,6 +2,7 @@ package com.xxfc.platform.order.service;
 
 import cn.hutool.core.bean.BeanUtil;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.xxfc.platform.activity.entity.ActivityProduct;
 import com.xxfc.platform.activity.entity.ActivityProductSpecs;
 import com.xxfc.platform.activity.entity.Coupon;
 import com.xxfc.platform.activity.feign.ActivityFeign;
@@ -63,6 +64,20 @@ public class OrderActivityService extends AbstractOrderHandle<OrderActivityDetai
 			bo.getOrder().setPicture(bo.getPicture());
 		super.handleDetail(bo);
 
+		ActivityProductSpecs activityProductSpecs = activityFeign.get(bo.getSpecsId()).getData();
+		if (activityProductSpecs != null) {
+			bo.getOrder().setGoodsAmount(activityProductSpecs.getGoodsPrice());
+			//修改规格库存
+			activityProductSpecs.setSales(bo.getNumber());
+			activityFeign.update(activityProductSpecs);
+
+			//修改商品库存
+			ActivityProduct activityProduct = new ActivityProduct();
+			activityProduct.setId(activityProductSpecs.getGoodsId());
+			activityProduct.setSales(bo.getNumber());
+			activityFeign.updateProduct(activityProduct);
+		}
+
 		//发送定时取消订单(30分钟)
 		rabbitProduct.sendDelayMessage(bo.getOrder(), autoCancelTime);
 	}