Merge branch 'master-tiande' into dev-tiande

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

@@ -1144,4 +1144,9 @@ public class BaseOrderBiz extends BaseBiz<BaseOrderMapper, BaseOrder> implements
 		}
 		return pageDataVO;
 	}
+
+
+	public  void  canelActivityOrder(Integer userId){
+		mapper.canelActivityOrder(userId);
+	}
 }
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java

@@ -11,6 +11,7 @@ import com.xxfc.platform.order.pojo.dto.OrderDTO;
 import com.xxfc.platform.order.pojo.order.OrderListVo;
 import com.xxfc.platform.order.pojo.order.OrderPageVO;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Update;
 import tk.mybatis.mapper.common.Mapper;
 
 import java.util.Date;
@@ -56,4 +57,6 @@ public interface BaseOrderMapper extends Mapper<BaseOrder> {
 										@Param("endDate") Date endDate,
 										@Param("startTime") Long startTime,
 										@Param("endTime") Long endTime);
+    @Update("UPDATE  base_order SET `status` = 2 WHERE user_id = #{userId} and type = 4 and `status` = 3")
+    void  canelActivityOrder(@Param("userId")Integer userId);
 }

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

@@ -11,6 +11,7 @@ import com.xxfc.platform.activity.vo.ActivityInfoRuleVo;
 import com.xxfc.platform.order.biz.*;
 import com.xxfc.platform.order.contant.enumerate.OrderStatusEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.entity.BaseOrder;
 import com.xxfc.platform.order.pojo.order.ActivityInfoBO;
 import com.xxfc.platform.order.pojo.price.OrderPriceVO;
 import com.xxfc.platform.universal.constant.DictionaryKey;
@@ -113,7 +114,7 @@ public class OrderActivityInfoService extends AbstractOrderHandle<OrderActivityI
         if (appUserDTO != null && appUserDTO.getParentId() != null)
             bo.setParentUserId(appUserDTO.getParentId());
         super.handleDetail(bo);
-
+        baseOrderBiz.canelActivityOrder(appUserDTO.getUserid());
         //发送定时取消订单(30分钟)
         rabbitProduct.sendDelayMessage(bo.getOrder(), autoCancelTime);
     }