Authored by chenchao

支持薅羊毛取消退卖家券

@@ -280,7 +280,8 @@ public class ActionStatusHold { @@ -280,7 +280,8 @@ public class ActionStatusHold {
280 OrderStatus.MINI_FAULT_REJECT.getCode(), 280 OrderStatus.MINI_FAULT_REJECT.getCode(),
281 OrderStatus.MINI_FAULT_OUT_TIME_REJECT.getCode(), 281 OrderStatus.MINI_FAULT_OUT_TIME_REJECT.getCode(),
282 OrderStatus.PLATFORM_APPRAISE_UNSURE.getCode(), 282 OrderStatus.PLATFORM_APPRAISE_UNSURE.getCode(),
283 - OrderStatus.PLATFORM_DETECTION_NOT_PASS.getCode() 283 + OrderStatus.PLATFORM_DETECTION_NOT_PASS.getCode(),
  284 + OrderStatus.PLATFORM_CANCEL_OF_BUYER_PULL_WOOL.getCode()
284 285
285 ); 286 );
286 } 287 }
@@ -6,7 +6,6 @@ import com.yohoufo.order.event.BuyerRefundCouponEvent; @@ -6,7 +6,6 @@ import com.yohoufo.order.event.BuyerRefundCouponEvent;
6 import com.yohoufo.order.service.impl.BuyerOrderCancelService; 6 import com.yohoufo.order.service.impl.BuyerOrderCancelService;
7 import com.yohoufo.order.utils.LoggerUtils; 7 import com.yohoufo.order.utils.LoggerUtils;
8 import org.slf4j.Logger; 8 import org.slf4j.Logger;
9 -import org.slf4j.LoggerFactory;  
10 import org.springframework.beans.factory.annotation.Autowired; 9 import org.springframework.beans.factory.annotation.Autowired;
11 import org.springframework.stereotype.Component; 10 import org.springframework.stereotype.Component;
12 11
@@ -442,6 +442,7 @@ public class BuyerOrderCancelService { @@ -442,6 +442,7 @@ public class BuyerOrderCancelService {
442 int rows = buyerOrderMapper.updateStatusWithStatusList(orderCode, targetStatus.getCode(), statusList, DateUtil.getCurrentTimeSecond()); 442 int rows = buyerOrderMapper.updateStatusWithStatusList(orderCode, targetStatus.getCode(), statusList, DateUtil.getCurrentTimeSecond());
443 logger.info("in buyer order cancelByCS because pull wool, req {} updateStatusWithStatusList {}", request, rows); 443 logger.info("in buyer order cancelByCS because pull wool, req {} updateStatusWithStatusList {}", request, rows);
444 if (rows > 0) { 444 if (rows > 0) {
  445 + asyncRefundSellerCoupon(pbo.getOrderCode(),targetStatus, preparedData.getSellerOrderGoods());
445 asyncProcessPenalty(preparedData, targetStatus); 446 asyncProcessPenalty(preparedData, targetStatus);
446 //clean cache 447 //clean cache
447 cacheCleaner.cleanSellerAndBuyerOrderDetailAndList(pbo.getSellerUid(), pbo.getUid(), orderCode); 448 cacheCleaner.cleanSellerAndBuyerOrderDetailAndList(pbo.getSellerUid(), pbo.getUid(), orderCode);