Authored by tanling

极速

... ... @@ -20,7 +20,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 速发货第三方对接接口
* 速发货第三方对接接口
*/
@RestController
@RequestMapping("/fastDelivery")
... ...
... ... @@ -136,7 +136,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
//是否直接鉴定通过
boolean isDirectPass = false;
// 速 不管是寄存还是发货 都需要通知卖家发货
// 速 不管是寄存还是发货 都需要通知卖家发货
if (fastDeliveryProxyService.isFastDeliveryGoods(orderInfo.getSkup())){
String wayBillCode = fastDeliveryProxyService.getVRWaybillCode(orderInfo.getOrderCode());
... ... @@ -232,7 +232,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
*/
private void processDepositOrder(BuyerOrder buyerOrder, SellerOrderGoods sellerOrderGoods){
SkupType skupType = SkupType.getSkupType(sellerOrderGoods.getAttributes());
//寄存订单 & 闪购商品 & 速闪购
//寄存订单 & 闪购商品 & 速闪购
switch (skupType){
case QUICK_DELIVER:
processDepositOrderOfQuickDeliverGoods(buyerOrder, sellerOrderGoods);
... ... @@ -320,7 +320,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
}
/**
* 速发货非寄存订单,商品:闪购
* 速发货非寄存订单,商品:闪购
* @param buyerOrder
* @param sellerOrderGoods
*/
... ... @@ -395,7 +395,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
case DEPOSITE:
processDepositOrder(buyerOrder, sellerOrderGoods);
break;
case FAST_DELIVERY: // 速发货
case FAST_DELIVERY: // 速发货
processFastDelivery(buyerOrder, sellerOrderGoods);
break;
}
... ...
... ... @@ -364,7 +364,7 @@ public class ErpFastDeliveryServiceImpl implements IErpFastDeliveryService {
// 1.检查入口参数
checkBatchOnShelf(req);
// 2.检查用户权限(速发货权限)
// 2.检查用户权限(速发货权限)
SellerWrapper sellerWrapper = checkFastDeliveryAuth(req.getUid());
// 3.检查批量上架权限
... ...
... ... @@ -209,7 +209,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
orderStatusFlowService.addAsy(buyerOrder.getOrderCode(), targetOrderStatus.getCode());
SellerOrderGoods psog = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
// 速: 无需再向买家发一遍[卖家发货]消息 & 虚拟单号无物流
// 速: 无需再向买家发一遍[卖家发货]消息 & 虚拟单号无物流
if (psog.getAttributes() == OrderAttributes.FAST_DELIVERY.getCode()){
// 物流直接更新成1
... ...
... ... @@ -510,7 +510,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
detailDesc = String.format(detailDesc, BuyerOrderStatusFlow.formatRemarkWithPrefixAndSuffix(statusFlow));
}
//急速发货商品,且已完成(区分寄存 发货)
//闪购发货商品,且已完成(区分寄存 发货)
if (SellerGoodsHelper.isQuickDeliver(skupType)) {
if (quickDeliverFinishStatus.contains(orderStatus.getCode())){
detailDesc = OrderDetailDesc.Seller.TRADE_DONE_QUICK_DELIVER;
... ...
... ... @@ -357,7 +357,7 @@ public class ShoppingServiceImpl implements IShoppingService {
BigDecimal storageManagementFee = null;
BigDecimal quickDeliverServiceFee = null;
//急速商品 非寄存
// 闪购商品 非寄存
if (!depositChoose && SkupType.QUICK_DELIVER.equals(skupType)){
FeeNRate feeNRate = feeNRateFunc.apply(skupType);
quickDeliverServiceFee = feeNRate.getQuickDeliverServiceFee();
... ...
... ... @@ -67,7 +67,7 @@ public class SubmitOrderServiceImpl implements ISubmitOrderService {
// 减库存
productProxyService.subtractStorage(orderBuilder.getProductId(), orderBuilder.getSkup());
// 速发货通知第三方
// 速发货通知第三方
if (orderBuilder.getOriginalAttributes() == OrderAttributes.FAST_DELIVERY.getCode()){
fastDeliveryProxyService.lockSkup(orderBuilder.getSkup());
}
... ...
... ... @@ -286,14 +286,14 @@ public class BaseNoticeFacade {
return SkupType.getSkupType(sellerOrderGoods.getAttributes()).attrName();
}
// 卖家skup是速的 特殊处理
// 卖家skup是速的 特殊处理
if (sellerOrderGoods.getAttributes() == OrderAttributes.FAST_DELIVERY.getCode()){
if (buyerOrder.getAttributes() == OrderAttributes.FAST_DELIVERY.getCode()){
//
//
return SkupType.getSkupType(sellerOrderGoods.getAttributes()).attrName();
}else{
// 速寄存
// 速寄存
return SkupType.getSkupType(sellerOrderGoods.getAttributes()).attrName()+SkupType.getSkupType(buyerOrder.getAttributes()).attrName();
}
}
... ...
... ... @@ -123,7 +123,7 @@ public class FastDeliveryProxyService {
}
/**
* 判定该skup是否是速发货的商品
* 判定该skup是否是速发货的商品
* @param skup
* @return
*/
... ...