...
|
...
|
@@ -10,6 +10,7 @@ import com.yohoufo.common.exception.UfoServiceException; |
|
|
import com.yohoufo.common.utils.DateUtil;
|
|
|
import com.yohoufo.dal.order.OrdersPrePayMapper;
|
|
|
import com.yohoufo.dal.order.SellerChangePriceRecordMapper;
|
|
|
import com.yohoufo.dal.order.SellerOrderGoodsMapper;
|
|
|
import com.yohoufo.dal.order.model.OrdersPrePay;
|
|
|
import com.yohoufo.dal.order.model.SellerChangePriceRecord;
|
|
|
import com.yohoufo.dal.order.model.SellerOrder;
|
...
|
...
|
@@ -22,6 +23,7 @@ import com.yohoufo.order.service.impl.SellerOrderCancelService; |
|
|
import com.yohoufo.order.service.proxy.ProductProxyService;
|
|
|
import com.yohoufo.order.service.proxy.ResourcesProxyService;
|
|
|
import com.yohoufo.order.utils.LoggerUtils;
|
|
|
import com.yohoufo.order.utils.SellerGoodsHelper;
|
|
|
import org.apache.commons.collections.CollectionUtils;
|
|
|
import org.slf4j.Logger;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
...
|
...
|
@@ -82,6 +84,9 @@ public class SingleGoodsChangePriceService { |
|
|
@Autowired
|
|
|
private ResourcesProxyService resourcesProxyService;
|
|
|
|
|
|
@Autowired
|
|
|
private SellerOrderGoodsMapper sellerOrderGoodsMapper;
|
|
|
|
|
|
|
|
|
/**
|
|
|
* compute Change Price4 NES(Not Entry Seller)
|
...
|
...
|
@@ -189,12 +194,12 @@ public class SingleGoodsChangePriceService { |
|
|
return;
|
|
|
}
|
|
|
|
|
|
|
|
|
if(sellerChangePriceRecordService.recordSuccess(scpr.getOrderCode(), ChangePriceStatus.WAITING_DEAL)==0){
|
|
|
return;
|
|
|
}
|
|
|
|
|
|
final Integer preSkup = scpr.getPreSkup(), currentSkup = scpr.getSkup();
|
|
|
long preOrderCode = scpr.getPreOrderCode();
|
|
|
Integer preSkup = scpr.getPreSkup();
|
|
|
try {
|
|
|
logger.info("in processAfterChangePriceOrderPaid cancel pre-SellerOrder , uid {} orderCode {} preOrderCode {}",
|
|
|
uid, orderCode, preOrderCode);
|
...
|
...
|
@@ -204,6 +209,11 @@ public class SingleGoodsChangePriceService { |
|
|
uid, orderCode, preOrderCode, ex);
|
|
|
rollBackWherPaidCallBackFail(uid, orderCode);
|
|
|
}finally {
|
|
|
//sync prd copy data when goods is imperfect
|
|
|
SellerOrderGoods prePsog = sellerOrderGoodsMapper.selectByPrimaryKey(preSkup);
|
|
|
if(SellerGoodsHelper.isImperfectGoods(prePsog.getAttributes())) {
|
|
|
productProxyService.cloneImperfectGoods(preSkup, currentSkup);
|
|
|
}
|
|
|
productProxyService.cancelHiddenSkup(preSkup);
|
|
|
}
|
|
|
}
|
...
|
...
|
|