Merge branch 'gray' of http://git.yoho.cn/ufo/yohoufo-fore into gray

@@ -25,6 +25,8 @@ public interface DelayTime {
 
     int SELLER_ORDER_WAITING_PAY = 15;
 
+    int SELLER_BID_ORDER_WAITING_PYY = 2;
+
     //瑕疵等待用户确认的超时时间，24小时
     //修改为48小时  2019-03-01 craig.qin
     int MINI_FAULT_CONFIRM_OUTER_TIME_MINUTE=48*60;

@@ -25,7 +25,7 @@ public class BuyerOrderPayDiffTimeHandler {
         OrdersPay ordersPay = ordersPayMapper.selectOrdersPayByPayLevel(orderCode, buyerUid, payLevel);
         Integer payTime;
         if (Objects.isNull(ordersPay) || Objects.isNull(payTime = ordersPay.getCreateTime())) {
-            logger.warn("in calBuyerPenalty not exist paid record.orderCode {}", orderCode);
+            logger.warn("in calBuyerPenalty not exist paid record.orderCode {},payLevel {}", orderCode, payLevel);
             throw new ServiceException(ServiceError.ORDER_HAS_NOT_PAID);
         }
         int currentTime = DateUtil.getCurrentTimeSecond();

@@ -424,6 +424,7 @@ public abstract class AbsOrderListService extends AbsOrderViewService implements
             // 当订单状态是待付款, 显示leftTime
             OrderAttributes oa = OrderAttributes.getOrderAttributes(buyerOrder.getAttributes());
             TimeoutBo timeoutBo = calTimeout(tabType, buyerOrder.getUid(), buyerOrder.getOrderCode(),
+                    buyerOrder.getBidType(),
                     buyerOrder.getStatus(), buyerOrder.getCreateTime(), oa);
             return timeoutBo;
         }

@@ -135,12 +135,12 @@ public abstract class AbsOrderViewService {
     }
 
 
-    public TimeoutBo calTimeout(TabType actor, Integer uid, Long orderCode,
+    public TimeoutBo calTimeout(TabType actor, Integer uid, Long orderCode,int bidType,
                          Integer orderStatus, Integer createTime, OrderAttributes oa){
         TimeoutBo timeoutBo = new TimeoutBo();
         OrderTimeoutContext otctx = OrderTimeoutContext.builder()
                 .actor(actor).uid(uid).orderCode(orderCode)
-                .orderStatus(orderStatus).createTime(createTime).oa(oa).build();
+                .orderStatus(orderStatus).createTime(createTime).oa(oa).bidType(bidType).build();
         TimeoutWrapper tw = orderTimeoutFactory.create(otctx);
         Integer leftTime = null;
         //特殊场景 orders_pay无记录时，timeoutBo = null
@@ -192,6 +192,7 @@ public abstract class AbsOrderViewService {
             return detailItem.getTimeoutBo();
         } else {
             return calTimeout(TabType.BUY, uid, orderCode,
+                    bidType,
                     orderStatusCode,
                     statusStartTime, oa);
         }

@@ -104,13 +104,6 @@ public class BuyerBidPriceService {
         //校验
         context.validate(true);
 
-        int oldSkup = context.sellerOrderGoods.getId();
-        logger.info("[{}] will change price,orderCode:{},oldSkup:{}", uid, context.buyerOrder.getOrderCode(), oldSkup);
-
-        //调价前将原skup取消，若生成新skup失败，则需要手动恢复原skup
-        bidProductProxyService.cancelSaleBeforeChangePrice(oldSkup);
-        logger.info("[{}] was canceled success", oldSkup);
-
         //构建参数
         BuyerBidPublishRequest req = BuyerBidPublishRequest.builder().uid(uid)
                 .storageId(context.sellerOrderGoods.getStorageId())
@@ -120,7 +113,19 @@ public class BuyerBidPriceService {
                 .userAddressPair(context.userAddressPair)
                 .businessClient(request.getBusinessClient())
                 .build();
-        BidPublishResult bidPublishResult = buyerBidPublishService.bidPublish(req);
+        //先计算
+        BuyerBidPublishService.BidComputeResult bidComputeResult = buyerBidPublishService.doCompute(req);
+
+        //计算无问题，锁定oldSkup
+        int oldSkup = context.sellerOrderGoods.getId();
+        logger.info("[{}] will change price,orderCode:{},oldSkup:{}", uid, context.buyerOrder.getOrderCode(), oldSkup);
+
+        //调价前将原skup取消，若生成新skup失败，则需要手动恢复原skup
+        bidProductProxyService.cancelSaleBeforeChangePrice(oldSkup);
+        logger.info("[{}] was canceled success", oldSkup);
+
+        //发布
+        BidPublishResult bidPublishResult = buyerBidPublishService.doBidPublish(req,bidComputeResult);
         try {
             //记录变价明细
             recordChangePriceDetail(context, bidPublishResult);

@@ -31,7 +31,6 @@ import com.yohoufo.order.model.response.BidPrePublishResponse;
 import com.yohoufo.order.model.response.BidPublishResponse;
 import com.yohoufo.order.mq.DelayTime;
 import com.yohoufo.order.mq.TopicConstants;
-import com.yohoufo.order.service.BuyerOrderStateChangers;
 import com.yohoufo.order.service.cache.CacheCleaner;
 import com.yohoufo.order.service.cache.CacheKeyBuilder;
 import com.yohoufo.order.service.listener.BuyerOrderChangeEvent;
@@ -101,9 +100,6 @@ public class BuyerBidPublishService {
     @Autowired
     private OrderChangeListenerContainer orderChangeListenerContainer;
 
-    @Autowired
-    private BuyerOrderStateChangers buyerOrderStateChangers;
-
 
     /**
      * 计算
@@ -112,22 +108,11 @@ public class BuyerBidPublishService {
      * 2.商品金额 + 运费
      */
     public BidComputeResponse compute(BuyerBidPublishRequest request) {
-        int uid = request.getUid();
-        //1.校验如下规则
-        //1.1 sku必须存在的
-        //1.2求购价格满足商品的最低和最高红线价，不满足提示价格过低,或者价格过高
-        //求购金额
-        BuyerBidConfig buyerBidConfig = metaConfigService.getBuyerBidConfig();
-        BidAndSuggestPrice bidPrice = new BidAndSuggestPrice(request.getPrice(),
-                productProxyService.getPrdPriceRange(request.getUid(), request.getStorageId()),
-                buyerBidConfig.getBasConfig());
-        //2.计算定金
-        Deposit deposit = computeDeposit(bidPrice, buyerBidConfig.getDConfig());
-        logger.info("[{}] buyerBid compute deposit result:{}", uid, deposit);
-
-        //3.计算商品金额 + 运费
-        ChargeContext chargeContext = computeGoods(request, bidPrice);
+        //计算
+        BidComputeResult bidComputeResult = doCompute(request);
 
+        Deposit deposit = bidComputeResult.deposit;
+        ChargeContext chargeContext = bidComputeResult.chargeContext;
         //算费结果
         ChargeResult chargeResult = chargeContext.getChargeResult();
         //返回结果
@@ -249,6 +234,11 @@ public class BuyerBidPublishService {
      * @return
      */
     public BidPublishResult bidPublish(BuyerBidPublishRequest request) {
+        BidComputeResult bidComputeResult = doCompute(request);
+        return doBidPublish(request,bidComputeResult);
+    }
+
+    public BidComputeResult doCompute(BuyerBidPublishRequest request) {
         int uid = request.getUid();
         int storageId = request.getStorageId();
         //1.校验如下规则
@@ -264,6 +254,21 @@ public class BuyerBidPublishService {
         //3.计算商品金额 + 运费
         ChargeContext chargeContext = computeGoods(request, bidPrice);
 
+        return new BidComputeResult(buyerBidConfig, bidPrice, deposit, chargeContext);
+    }
+
+    /**
+     * 发布
+     * @param request
+     * @param bidComputeResult
+     * @return
+     */
+    public BidPublishResult doBidPublish(BuyerBidPublishRequest request, BidComputeResult bidComputeResult) {
+        int uid = request.getUid();
+        int storageId = request.getStorageId();
+        BidAndSuggestPrice bidPrice = bidComputeResult.bidPrice;
+        Deposit deposit = bidComputeResult.deposit;
+        ChargeContext chargeContext = bidComputeResult.chargeContext;
         //获取商品信息
         GoodsInfo goodsInfo = skupService.getProductDetail(uid, storageId, bidPrice.getPrice(), SkupType.getSkupType(request.getSkupType()));
 
@@ -300,6 +305,7 @@ public class BuyerBidPublishService {
     }
 
 
+
     /**
      * skup 发布
      * 记录到seller_order_goods中
@@ -365,4 +371,18 @@ public class BuyerBidPublishService {
             return request.getUserAddressPair();
         }
     }
+
+    public class BidComputeResult {
+        BuyerBidConfig buyerBidConfig;
+        BidAndSuggestPrice bidPrice;
+        Deposit deposit;
+        ChargeContext chargeContext;
+
+        public BidComputeResult(BuyerBidConfig buyerBidConfig, BidAndSuggestPrice bidPrice, Deposit deposit, ChargeContext chargeContext) {
+            this.buyerBidConfig = buyerBidConfig;
+            this.bidPrice = bidPrice;
+            this.deposit = deposit;
+            this.chargeContext = chargeContext;
+        }
+    }
 }

@@ -223,6 +223,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
         // 待付款时，剩余时间
         TimeoutBo timeoutBo = calTimeout(tabType, buyerOrder.getUid(),
                 buyerOrder.getOrderCode(), orderStatus.getCode(),
+                buyerOrder.getBidType(),
                 buyerOrder.getCreateTime(), oa);
         if (Objects.nonNull(timeoutBo)) {
             statusDetail.setLeftTime(timeoutBo.getLeftTime());

@@ -1483,7 +1483,10 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
 
         CodeMeta codeMeta = orderCodeGenerator.expId(orderCode);
         OrderCodeType orderCodeType = OrderCodeType.getOrderCodeType(codeMeta.getType());
-
+        final BusinessClientEnum bce = OrderAssist.findBusinessClient(businessClient);
+        String clientName = OrderAssist.matchClientName(bce);
+        Supplier<String> commonDeliverDescSupplier = () -> formatDeliverDesc(SellerConfig.DeliverDesc.COMMON, clientName);
+        Supplier<String> warnTipsSupplier = () -> formatWarnTips(SellerConfig.WarnTips.BUYER_ORDER, clientName);
         AppraiseAddressResp resp = null;
         if (OrderCodeType.GOODS_SERVICE.equals(orderCodeType)){
             ServiceOrderProcessor.ExistenceNode existenceNode = serviceOrderProcessor.isAppraiseOrder(orderCode);
@@ -1512,17 +1515,15 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
 
         if (isHKLargeSettlementSuper(uid)) {
             resp = appraiseAddressService.queryHKAppraiseAddress();
-            resp.setDeliverDesc(SellerConfig.DeliverDesc.COMMON);
-            resp.setWarnTips(SellerConfig.WarnTips.BUYER_ORDER);
+            resp.setDeliverDesc(commonDeliverDescSupplier.get());
+            resp.setWarnTips(warnTipsSupplier.get());
             return resp;
         }
-        final BusinessClientEnum bce = OrderAssist.findBusinessClient(businessClient);
-        String clientName = OrderAssist.matchClientName(bce);
+
 
         //寄存订单
         BuyerOrder buyerOrder = buyerOrderMapper.selectOnlyByOrderCode(orderCode);
-        Supplier<String> commonDeliverDescSupplier = () -> formatDeliverDesc(SellerConfig.DeliverDesc.COMMON, clientName);
-        Supplier<String> warnTipsSupplier = () -> formatWarnTips(SellerConfig.WarnTips.BUYER_ORDER, clientName);
+
         //防止较早版本出错
         if (Objects.nonNull(buyerOrder)) {
             if (OrderAttributes.DEPOSITE.getCode() == buyerOrder.getAttributes()) {

@@ -177,7 +177,7 @@ public class SellerBidPublishService {
             EventBusPublisher.publishEvent(SellerBidOrderPaySuccessEvent.builder().uid(uid).skup(skup).build());
         } else {
             OrderCancelEvent orderCancelEvent = OrderCancelEvent.builder().uid(uid)
-                    .orderCode(orderCode).payExpire(DelayTime.SELLER_ORDER_WAITING_PAY)
+                    .orderCode(orderCode).payExpire(DelayTime.SELLER_BID_ORDER_WAITING_PYY)
                     .actorType(TabType.SELL).cancelType(CancelType.TIME_OUT).build();
             EventBusPublisher.publishEvent(orderCancelEvent);
         }

@@ -307,11 +307,14 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
      * @return
      */
     private OrderDetailInfo.StatusDetail getStatusDetail(SellerOrder order,
+                                                         int bidType,
                                                          SkupStatus skupStatus) {
+
+
         OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail.builder()
                 .status(skupStatus.getCode())
                 .statuStr(skupStatus.getDesc())
-                .detailDesc(skupStatus.getDetailShowDesc())
+                .detailDesc(skupStatus.getDetailShowDesc(String.valueOf(bidType == OrderConstant.BUYER_BID_TYPE ? OrderInfo.SELLER_BID_PAY_TIMEOUT/60 : OrderInfo.SELLER_PAY_TIMEOUT/60)))
                 .paymentTips(skupStatus.getPaymentTips())
                 .build();
 
@@ -320,6 +323,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
                 .createTime(order.getCreateTime())
                 .orderCodeType(OrderCodeType.SELLER_TYPE)
                 .orderStatus(skupStatus.getCode())
+                .bidType(bidType)
                 .calculatePayLeftTime();
         Integer leftTime = timeoutBo.getLeftTime();
         statusDetail.setLeftTime(leftTime);
@@ -374,8 +378,10 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
         OrderDetailInfo orderDetailInfo = new OrderDetailInfo();
         orderDetailInfo.setUid(order.getUid());
         orderDetailInfo.setOrderCode(getOrderCode(skupStatus, order));
+        //求购订单类型
+        orderDetailInfo.setBidType(sellerOrderGoods.getBidType());
         Integer storageNum = sellerOrderGoods.getNum();
-        Integer leftTime = TimeUtils.calLeftTime(OrderInfo.SELLER_PAY_TIMEOUT, order.getCreateTime());
+        Integer leftTime = TimeUtils.calLeftTime(sellerOrderGoods.isBidSkup() ? OrderInfo.SELLER_BID_PAY_TIMEOUT : OrderInfo.SELLER_PAY_TIMEOUT, order.getCreateTime());
         Integer soga = sellerOrderGoods.getAttributes();
         SkupType skupType = SkupType.getSkupType(soga);
 
@@ -391,7 +397,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
         orderDetailInfo.setUserAddress(addressInfo);
         //卖家
         assembleSoldPrdCompute(orderDetailInfo, order.getUid(), sellerOrderGoods.getId());
-        OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(order, skupStatus);
+        OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(order, sellerOrderGoods.getBidType(), skupStatus);
 
         orderDetailInfo.setAttributes(soga);
 
@@ -495,7 +501,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
         Long orderCode = buyerOrder.getOrderCode();
         int orderStatusCode = orderStatus.getCode();
         Integer createTime = buyerOrder.getCreateTime();
-        TimeoutBo timeoutBo = calTimeout(tabType, buyerUid, orderCode, orderStatusCode, createTime, oa);
+        TimeoutBo timeoutBo = calTimeout(tabType, buyerUid, orderCode,buyerOrder.getBidType(), orderStatusCode, createTime, oa);
         if (Objects.nonNull(timeoutBo)) {
             statusDetail.setLeftTime(timeoutBo.getLeftTime());
         }
@@ -594,6 +600,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
                 orderStatus = orderDetailInfo.getStatusDetail().getStatus();
                 Integer createTime = orderDetailInfo.getSecendLevelCreateTime();
                 timeoutBo = calTimeout(TabType.SELL, buyerUid, orderCode,
+                        orderDetailInfo.getBidType(),
                         orderStatus, createTime, oa);
             }
             Integer leftTime = timeoutBo.getLeftTime();
@@ -639,7 +646,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
         SellerOrderGoods sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
         SkupStatus skupStatus = SkupStatus.getSkupStatus(sellerOrderGoods.getStatus());
 
-        OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(sellerOrder, skupStatus);
+        OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(sellerOrder,sellerOrderGoods.getBidType(), skupStatus);
         OrderDetailInfo orderDetailInfo = new OrderDetailInfo();
 
         orderDetailInfo.setOrderCode(orderCode);

@@ -203,6 +203,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
                     TimeoutBo timeoutBo = new SellerOrderTimeoutWrapper().createTime(oli.getSecendLevelCreateTime())
                             .orderCodeType(orderCodeType)
                             .orderStatus(orderStatus)
+                            .bidType(oli.getBidType())
                             .calculatePayLeftTime();
                     oli.setLeftTime(timeoutBo.getLeftTime());
                     oli.setTimeLimit(timeoutBo.getTimelimit());
@@ -253,11 +254,12 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
         // 订单中状态显示
         orderListInfo.setStatus(skupStatus.getCode());
         orderListInfo.setStatuStr(skupStatus.getDesc());
+        orderListInfo.setBidType(sellerOrderGoods.getBidType());
         Integer storageNum = sellerOrderGoods.getNum();
 
         // 当订单状态是待付款, 显示leftTime
         if (sellerOrderGoods.getStatus() == SkupStatus.CAN_NOT_SELL.getCode()){
-            int payTimeLimit = OrderInfo.SELLER_PAY_TIMEOUT;
+            int payTimeLimit = sellerOrderGoods.isBidSkup() ? OrderInfo.SELLER_BID_PAY_TIMEOUT : OrderInfo.SELLER_PAY_TIMEOUT;
             orderListInfo.setLeftTime(TimeUtils.calLeftTime(payTimeLimit, sellerOrder.getCreateTime()));
             orderListInfo.setTimeLimit(payTimeLimit);
         }

@@ -783,8 +783,10 @@ public class SellerOrderCancelService {
         }
         if (SellerOrderStatus.WAITING_PAY.getCode() == status){
             //send msg to mq system
-            event.setPayExpire(DelayTime.SELLER_ORDER_WAITING_PAY);
-            tradeMqSender.send(TopicConstants.SELLER_ORDER_AUTO_CANCEL, event , DelayTime.SELLER_ORDER_WAITING_PAY);
+            if (event.getPayExpire() <= 0) {
+                event.setPayExpire(DelayTime.SELLER_ORDER_WAITING_PAY);
+            }
+            tradeMqSender.send(TopicConstants.SELLER_ORDER_AUTO_CANCEL, event , event.getPayExpire());
         }
     }
 

@@ -92,7 +92,7 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService {
         OrderAttributes oa = OrderAttributes.getOrderAttributes(pao.getAttributes());
 
         //
-        TimeoutBo timeout = calTimeout(TabType.BUY, uid, orderCode, pao.getStatus(),
+        TimeoutBo timeout = calTimeout(TabType.BUY, uid, orderCode,0, pao.getStatus(),
                 pao.getCreateTime(), oa);
 
         ExpressInfoDetail lastExpressInfoDetail = expressInfoService.getLastExpressInfoDetail(pao);

@@ -123,7 +123,7 @@ public class SellerDepositOrderListService extends AbsOrderViewService {
                         .build())
                 .collect(Collectors.toCollection(()->new ArrayList<>(aogList.size())));
 
-        TimeoutBo timeout = calTimeout(TabType.BUY, uid, orderCode, pao.getStatus(),
+        TimeoutBo timeout = calTimeout(TabType.BUY, uid, orderCode,0, pao.getStatus(),
                 pao.getCreateTime(), oa);
         return SellerDepositOrderListResp.builder()
                 .uid(uid)

@@ -35,4 +35,6 @@ public class OrderTimeoutContext {
     Integer payTime;
 
     OrderAttributes oa;
+
+    int bidType;
 }

@@ -27,6 +27,7 @@ public class OrderTimeoutFactory {
         Integer orderStatus = otctx.orderStatus;
         Integer createTime = otctx.createTime;
         OrderAttributes oa = otctx.oa;
+        int bidType = otctx.bidType;
 
         boolean isBuyer = actor.equals(TabType.BUY);
         boolean isSeller = actor.equals(TabType.SELL);
@@ -59,7 +60,8 @@ public class OrderTimeoutFactory {
                         tow = new SellerOrderTimeoutWrapper()
                                 .orderCodeType(orderCodeType)
                                 .orderStatus(orderStatus)
-                                .createTime(createTime);
+                                .createTime(createTime)
+                                .bidType(bidType);
                     }
                     isPaid = orderStatus == OrderStatus.HAS_PAYED.getCode();
                     if (isPaid){
@@ -76,6 +78,7 @@ public class OrderTimeoutFactory {
                                 .orderCodeType(orderCodeType)
                                 .orderStatus(orderStatus)
                                 .createTime(createTime)
+                                .bidType(bidType)
                                 ;
                     }
                 }

@@ -5,6 +5,7 @@ import com.yohobuy.ufo.model.order.bo.TimeoutBo;
 import com.yohobuy.ufo.model.order.common.OrderCodeType;
 import com.yohobuy.ufo.model.order.common.OrderStatus;
 import com.yohobuy.ufo.model.order.common.SkupStatus;
+import com.yohobuy.ufo.model.order.constants.OrderConstant;
 import com.yohobuy.ufo.model.order.constants.TimeoutCase;
 import com.yohoufo.order.mq.DelayTime;
 
@@ -20,6 +21,7 @@ public class SellerOrderTimeoutWrapper extends AbsTimeoutWrapper{
     private OrderCodeType orderCodeType;
     private Integer orderStatus;
     private int createTime;
+    private int bidType;
 
     public SellerOrderTimeoutWrapper orderCodeType(OrderCodeType orderCodeType){
         this.orderCodeType = orderCodeType;
@@ -36,6 +38,15 @@ public class SellerOrderTimeoutWrapper extends AbsTimeoutWrapper{
         return  this;
     }
 
+    public SellerOrderTimeoutWrapper bidType(int bidType) {
+        this.bidType = bidType;
+        return this;
+    }
+
+    public boolean isBidType() {
+        return bidType == OrderConstant.BUYER_BID_TYPE;
+    }
+
     /**
      *
      * @return
@@ -61,7 +72,7 @@ public class SellerOrderTimeoutWrapper extends AbsTimeoutWrapper{
         //查看卖家
         if (orderCodeType == OrderCodeType.SELLER_TYPE){
             isWaitingPay = orderStatus == SkupStatus.CAN_NOT_SELL.getCode();
-            if (isWaitingPay)timeout = OrderInfo.SELLER_PAY_TIMEOUT;
+            if (isWaitingPay) timeout = isBidType() ? OrderInfo.SELLER_BID_PAY_TIMEOUT : OrderInfo.SELLER_PAY_TIMEOUT;
         }
 
         if(isWaitingPay){

+package com.yohoufo.order.service.impl;
+
+import com.yohobuy.ufo.model.order.req.SellerOrderSubmitReq;
+import com.yohoufo.order.BaseWebTest;
+import org.junit.Test;
+import org.springframework.beans.factory.annotation.Autowired;
+
+public class SellerOrderServiceTest extends BaseWebTest {
+
+    @Autowired
+    private SellerOrderService sellerOrderService;
+
+    @Test
+    public void test(){
+        int uid = 500031424;
+        int storage_id = 10091252;
+        String price = "59";
+        int num = 1;
+        String address_id = "2FUbfklOlk7tZuIPNc4TDA==";
+        int skupType = 1;
+        String businessClient = null;
+        SellerOrderSubmitReq req = SellerOrderSubmitReq.builder()
+                .uid(uid)
+                .storageId(storage_id)
+                .price(price)
+                .addressId(address_id)
+                .num(num)
+                .skupType(skupType)
+                .businessClient(businessClient)
+                .build();
+        sellerOrderService.publishPrd(req);
+    }
+}

@@ -37,7 +37,7 @@ hystrix.threadpool.default.maxQueueSize=50000
 hystrix.threadpool.default.queueSizeRejectionThreshold=45000
 
 #zookeeper address
-zkAddress=192.168.102.45:2181
+zkAddress=192.168.104.201:2181
 #zkAddress=192.168.102.45:2181
 # web context
 web.context=ufo-gateway
@@ -49,7 +49,7 @@ password.aes.key=yoho9646yoho9646
 #用户uic服务地址
 uic.service.url=http://java-yoho-uic.test3.ingress.dev.yohocorp.com/uic
 #消息盒子-baseurl
-inbox.baseurl=http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway/?debug=XYZ
+inbox.baseurl=http://172.16.12.59:8080/ufo-gateway/?debug=XYZ
 #signature encrypt key salt
 gateway.signature.key.salt=mQyMTMwZjlmZTZmYjY4UjkNmYwZGM0OTk0Y
 trace.enabled=false
@@ -71,13 +71,16 @@ yoho.recovery.zkPath=/yh/config/recovery
 
 
 wechat.app.partnerid=1218934901
-wechat.app.partnerkey=b22de5cfd0ded341e0516505f72649a9
 wechat.app.appid=wx049fdaa3ba9cdd7a
 
 wechat.notifyurl=http://testapi.yohops.com/payment/weixin_notify
 
 alipay.notifyurl=http://testapi.yohops.com/payment/alipay_notify
 
+alipay.cross.border.notifyurl=http://testapi.yohops.com/payment/alipay_notify
+
+alipay.transfer.notifyurl=http://testapi.yohops.com/payment/alipay_transfer_notify
+
 erp-gateway.url=http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/erp-gateway
 
 redis.readonly.proxy.address=192.168.102.45
@@ -104,29 +107,36 @@ order.buyer.cancelWhenSellerUnDelivery.money=38
 order.buyer.cancelWhenSellerDelivery.sellerGetMoneyRate=0.8
 order.buyer.cancelWhenSellerUnDelivery.sellerGetMoneyRate=0.8
 
+order.seller.tip.publishMoneyTip=\u4FDD\u8BC1\u91D1\u4F59\u989D\u4E0D\u8DB3
+order.seller.tip.publishFunctionTip=\u8BF7\u5145\u503C\u540E\u8FDB\u884C\u6B63\u5E38\u4E0A\u67B6/\u4E0B\u67B6
+order.seller.tip.canSaleMoneyTip=\u4FDD\u8BC1\u91D1\u4F59\u989D\u4F4E\u4E8E
+order.seller.tip.canSaleFunctionTip=\u5E73\u53F0\u4E0B\u67B6\u60A8\u6240\u6709\u51FA\u552E\u4E2D\u7684\u5546\u54C1
+order.seller.tip.recoverTip=\u5145\u503C \uFFE5{} \u6062\u590D\u8D85\u7EA7\u5546\u5BB6\u6743\u9650
+
 
 
 uic.url=http://java-yoho-uic.test3.ingress.dev.yohocorp.com/uic
 yoho.message.controller.url=http://message-controller.yohoops.org/yoho-message-controller
+yoho.reviewed.controller.url=http://java-yoho-reviewed.test3.ingress.dev.yohocorp.com/reviewed
 
 #rabbit address for transaction compensate
+#rabbit_host=192.168.104.199:30005
 rabbit_host=192.168.102.45:5672
 rabbit_user=yoho
 rabbit_password=yoho
 
-
-yoho.gateway.url=http://api-test3.dev.yohocorp.com
-
-
 #二次发货提醒 24*60 minutes
 mq.seller.deliverNotice.second=1440
 #发货失败提醒 36*60 minutes
-mq.seller.deliverNotice.third=2160
+mq.seller.deliverNotice.third=15
 
 #old 二次发货提醒 108*60 minutes
 mq.seller.deliverNotice.old.second=6480
 #old发货失败提醒 120*60
 mq.seller.deliverNotice.old.third=7200
+
+yoho.gateway.url=http://api-test3.dev.yohocorp.com
+
 ufo.platform.url=http://java-ufo-platform.test3.ingress.dev.yohocorp.com/ufoPlatform
 
 offline.store.seller=70,50000638
@@ -136,8 +146,12 @@ ip.port.uic.server = java-yoho-uic.test3.ingress.dev.yohocorp.com
 ufo.nfc.syncBlockChain.url=http://192.168.102.49:3030/api/addItem
 
 ufo.invite.productSortLimit=16,20,40
-alipay.transfer.notifyurl=http://testapi.yohops.com/payment/alipay_transfer_notify
+
+ufo.product.addSizeSortId=40
+
+#用户实名认证的次数
+ufo.certification.timesLimit=3
 
 # Unionpay
 unionpay.env=00
-unionpay.notifyurl=http://testapi.yohops.com/payment/ufo_unionpay_notify
\ No newline at end of file
+unionpay.notifyurl=http://testapi.yohops.com/payment/ufo_unionpay_notify

 datasources:
-  ufo_passport:
-    servers:
-      - 192.168.102.219:3306
-      - 192.168.102.219:3306
-    username: yh_test
-    password: 9nm0icOwt6bMHjMusIfMLw==
-    daos:
-      - com.yohoufo.dal.user.IUserAuthorizeHistoryDao
-      - com.yohoufo.dal.user.IUserAuthorizeInfoDao
-      - com.yohoufo.dal.user.IZhiMaCertDao
-      - com.yohoufo.dal.user.UsersNoticeMapper
+   ufo_passport:
+      servers:
+        - 192.168.102.219:3306
+        - 192.168.102.219:3306
+      username: yh_test
+      password: 9nm0icOwt6bMHjMusIfMLw==
+      daos:
+        - com.yohoufo.dal.user.IUserAuthorizeHistoryDao
+        - com.yohoufo.dal.user.IUserAuthorizeInfoDao
+        - com.yohoufo.dal.user.IZhiMaCertDao
+        - com.yohoufo.dal.user.UsersNoticeMapper
 
-  ufo_product:
-    servers:
-      - 192.168.102.219:3306
-      - 192.168.102.219:3306
-    username: yh_test
-    password: 9nm0icOwt6bMHjMusIfMLw==
-    daos:
-      - com.yohoufo.dal.product.StoragePriceMapper
-      - com.yohoufo.dal.product.StorageMapper
-      - com.yohoufo.dal.product.ProductMapper
-      - com.yohoufo.dal.product.GoodsMapper
-      - com.yohoufo.dal.product.GoodsImagesMapper
-      - com.yohoufo.dal.product.SizeMapper
-      - com.yohoufo.dal.product.BrandMapper
-      - com.yohoufo.dal.product.BrandSeriesMapper
-      - com.yohoufo.dal.product.ProductSortMapper
-      - com.yohoufo.dal.product.SearchWordMapper
-      - com.yohoufo.dal.product.SaleCategoryMapper
-      - com.yohoufo.dal.product.IdentifyRecordsMapper
-      - com.yohoufo.dal.product.IdentifyRelationMapper
-      - com.yohoufo.dal.product.ProductChainMapper
-      - com.yohoufo.dal.product.PriceTrendSixtyDayMapper
-      - com.yohoufo.dal.product.PriceTrendMonthMapper
-      - com.yohoufo.dal.product.PriceTrendHalfYearMapper
-      - com.yohoufo.dal.product.PriceTrendDayMapper
-      - com.yohoufo.dal.product.ProductImportTranItemMapper
-      - com.yohoufo.dal.product.TransferRecordsMapper
-      - com.yohoufo.dal.product.TransferRecordsHistoryMapper
-      - com.yohoufo.dal.product.ProductSalesMapper
-      - com.yohoufo.dal.product.ProductLimitSaleMapper
-      - com.yohoufo.dal.product.ProductSelfShelvesMapper
-      - com.yohoufo.dal.product.ProductSelfShelvesPicMapper
-      - com.yohoufo.dal.product.SecondhandFlawMapper
-      - com.yohoufo.dal.product.SecondhandImagesMapper
-      - com.yohoufo.dal.product.SecondhandInfoMapper
-      - com.yohoufo.dal.product.SelfSizeMapper
-      - com.yohoufo.dal.product.SelfSizeUidMapper
-      - com.yohoufo.dal.product.ProductProfitMapper
-      - com.yohoufo.dal.product.ProductPoolDetailMapper
-      - com.yohoufo.dal.product.BidStoragePriceMapper
+   ufo_product:
+      servers:
+        - 192.168.102.219:3306
+        - 192.168.102.219:3306
+      username: yh_test
+      password: 9nm0icOwt6bMHjMusIfMLw==
+      daos:
+        - com.yohoufo.dal.product.StoragePriceMapper
+        - com.yohoufo.dal.product.StorageMapper
+        - com.yohoufo.dal.product.ProductMapper
+        - com.yohoufo.dal.product.GoodsMapper
+        - com.yohoufo.dal.product.GoodsImagesMapper
+        - com.yohoufo.dal.product.SizeMapper
+        - com.yohoufo.dal.product.BrandMapper
+        - com.yohoufo.dal.product.BrandSeriesMapper
+        - com.yohoufo.dal.product.ProductSortMapper
+        - com.yohoufo.dal.product.SearchWordMapper
+        - com.yohoufo.dal.product.SaleCategoryMapper
+        - com.yohoufo.dal.product.IdentifyRecordsMapper
+        - com.yohoufo.dal.product.IdentifyRelationMapper
+        - com.yohoufo.dal.product.ProductChainMapper
+        - com.yohoufo.dal.product.PriceTrendSixtyDayMapper
+        - com.yohoufo.dal.product.PriceTrendMonthMapper
+        - com.yohoufo.dal.product.PriceTrendHalfYearMapper
+        - com.yohoufo.dal.product.PriceTrendDayMapper
+        - com.yohoufo.dal.product.ProductImportTranItemMapper
+        - com.yohoufo.dal.product.TransferRecordsMapper
+        - com.yohoufo.dal.product.TransferRecordsHistoryMapper
+        - com.yohoufo.dal.product.ProductSalesMapper
+        - com.yohoufo.dal.product.ProductLimitSaleMapper
+        - com.yohoufo.dal.product.ProductSelfShelvesMapper
+        - com.yohoufo.dal.product.ProductSelfShelvesPicMapper
+        - com.yohoufo.dal.product.SecondhandFlawMapper
+        - com.yohoufo.dal.product.SecondhandImagesMapper
+        - com.yohoufo.dal.product.SecondhandInfoMapper
+        - com.yohoufo.dal.product.SelfSizeMapper
+        - com.yohoufo.dal.product.SelfSizeUidMapper
+        - com.yohoufo.dal.product.ProductProfitMapper
+        - com.yohoufo.dal.product.ProductPoolDetailMapper
+        - com.yohoufo.dal.product.BidStoragePriceMapper
 
 
-  ufo_order:
-    servers:
-      - 192.168.102.219:3306
-      - 192.168.102.219:3306
-    username: yh_test
-    password: 9nm0icOwt6bMHjMusIfMLw==
-    daos:
-      - com.yohoufo.dal.order.BuyerOrderGoodsMapper
-      - com.yohoufo.dal.order.BuyerOrderMapper
-      - com.yohoufo.dal.order.BuyerOrderMetaMapper
-      - com.yohoufo.dal.order.ExpressRecordMapper
-      - com.yohoufo.dal.order.ExpressInfoMapper
-      - com.yohoufo.dal.order.SellerOrderGoodsMapper
-      - com.yohoufo.dal.order.SellerOrderMapper
-      - com.yohoufo.dal.order.SellerOrderMetaMapper
-      - com.yohoufo.dal.order.OrdersPayMapper
-      - com.yohoufo.dal.order.OrdersPayRefundMapper
-      - com.yohoufo.dal.order.ExpressCompanyMapper
-      - com.yohoufo.dal.order.AppraiseAddressMapper
-      - com.yohoufo.dal.order.TradeBillsMapper
-      - com.yohoufo.dal.order.OrdersPayTransferMapper
-      - com.yohoufo.dal.order.ManualTransferMapper
-      - com.yohoufo.dal.order.MachineIdGenerateMapper
-      - com.yohoufo.dal.order.SkupBatchMapper
-      - com.yohoufo.dal.order.SellerWalletMapper
-      - com.yohoufo.dal.order.SellerWalletDetailMapper
-      - com.yohoufo.dal.order.OrderCouponMapper
-      - com.yohoufo.dal.order.EntrySellerRechargeOrderMapper
-      - com.yohoufo.dal.order.StoredSellerMapper
-      - com.yohoufo.dal.order.SuperEntrySellerMapper
-      - com.yohoufo.dal.order.QiniuLiveRecordMapper
-      - com.yohoufo.dal.order.SellerOrderGoodsViewMapper
-      - com.yohoufo.dal.order.SellerTaskMapper
-      - com.yohoufo.dal.order.SellerTaskDetailMapper
-      - com.yohoufo.dal.order.OrdersPrePayMapper
-      - com.yohoufo.dal.order.MetaConfigMapper
-      - com.yohoufo.dal.order.BuyerOrderStatusFlowMapper
-      - com.yohoufo.dal.order.OrderOperateRecordMapper
-      - com.yohoufo.dal.order.QualityCheckMapper
-      - com.yohoufo.dal.order.BusinessLicenseMapper
-      - com.yohoufo.dal.order.SellerEnterApplyMapper
-      - com.yohoufo.dal.order.SellerFuncMapper
-      - com.yohoufo.dal.order.SellerLevelFuncMapper
-      - com.yohoufo.dal.order.OrderOverTimeMapper
-      - com.yohoufo.dal.order.BuyerOrderViewMapper
-      - com.yohoufo.dal.order.SellerJoinHistoryMapper
-      - com.yohoufo.dal.order.SellerChangePriceRecordMapper
-      - com.yohoufo.dal.order.InviteActivityMapper
-      - com.yohoufo.dal.order.InviteRecordMapper
-      - com.yohoufo.dal.order.InviterMapper
-      - com.yohoufo.dal.order.InviteSettlementItemMapper
-      - com.yohoufo.dal.order.InviteSettlementMapper
-      - com.yohoufo.dal.order.InviteCodeSequenceMapper
-      - com.yohoufo.dal.order.InviteCodeSequenceRandomMapper
-      - com.yohoufo.dal.order.SellerGoodsStatusFlowMapper
-      - com.yohoufo.dal.order.CmsPayMapper
-      - com.yohoufo.dal.order.OrdersPayHbfqMapper
-      - com.yohoufo.dal.order.BlackUserMapper
-      - com.yohoufo.dal.order.StorageDepositMapper
-      - com.yohoufo.dal.order.DepositOrderMapper
-      - com.yohoufo.dal.order.SellerOrderStatsConfigMapper
-      - com.yohoufo.dal.order.SellerOrderStatsResultMapper
-      - com.yohoufo.dal.order.AlipayBlackUserMapper
-      - com.yohoufo.dal.order.AppraiseOrderMapper
-      - com.yohoufo.dal.order.AppraiseOrderGoodsMapper
-      - com.yohoufo.dal.order.AppraiseOrderMetaMapper
-      - com.yohoufo.dal.order.AppraiseOrderStorageMapper
-      - com.yohoufo.dal.order.DepositCodeMapper
-      - com.yohoufo.dal.order.SellerServiceFeeRuleMapper
-      - com.yohoufo.dal.order.BuyerOrderPromotionMapper
-      - com.yohoufo.dal.order.BuyerChangePriceRecordMapper
+   ufo_order:
+         servers:
+           - 192.168.102.219:3306
+           - 192.168.102.219:3306
+         username: yh_test
+         password: 9nm0icOwt6bMHjMusIfMLw==
+         daos:
+           - com.yohoufo.dal.order.BuyerOrderGoodsMapper
+           - com.yohoufo.dal.order.BuyerOrderMapper
+           - com.yohoufo.dal.order.BuyerOrderMetaMapper
+           - com.yohoufo.dal.order.ExpressRecordMapper
+           - com.yohoufo.dal.order.ExpressInfoMapper
+           - com.yohoufo.dal.order.SellerOrderGoodsMapper
+           - com.yohoufo.dal.order.SellerOrderMapper
+           - com.yohoufo.dal.order.SellerOrderMetaMapper
+           - com.yohoufo.dal.order.OrdersPayMapper
+           - com.yohoufo.dal.order.OrdersPayRefundMapper
+           - com.yohoufo.dal.order.ExpressCompanyMapper
+           - com.yohoufo.dal.order.AppraiseAddressMapper
+           - com.yohoufo.dal.order.TradeBillsMapper
+           - com.yohoufo.dal.order.OrdersPayTransferMapper
+           - com.yohoufo.dal.order.ManualTransferMapper
+           - com.yohoufo.dal.order.MachineIdGenerateMapper
+           - com.yohoufo.dal.order.SkupBatchMapper
+           - com.yohoufo.dal.order.SellerWalletMapper
+           - com.yohoufo.dal.order.SellerWalletDetailMapper
+           - com.yohoufo.dal.order.OrderCouponMapper
+           - com.yohoufo.dal.order.EntrySellerRechargeOrderMapper
+           - com.yohoufo.dal.order.StoredSellerMapper
+           - com.yohoufo.dal.order.SuperEntrySellerMapper
+           - com.yohoufo.dal.order.QiniuLiveRecordMapper
+           - com.yohoufo.dal.order.SellerOrderGoodsViewMapper
+           - com.yohoufo.dal.order.SellerTaskMapper
+           - com.yohoufo.dal.order.SellerTaskDetailMapper
+           - com.yohoufo.dal.order.OrdersPrePayMapper
+           - com.yohoufo.dal.order.MetaConfigMapper
+           - com.yohoufo.dal.order.BuyerOrderStatusFlowMapper
+           - com.yohoufo.dal.order.OrderOperateRecordMapper
+           - com.yohoufo.dal.order.QualityCheckMapper
+           - com.yohoufo.dal.order.BusinessLicenseMapper
+           - com.yohoufo.dal.order.SellerEnterApplyMapper
+           - com.yohoufo.dal.order.SellerFuncMapper
+           - com.yohoufo.dal.order.SellerLevelFuncMapper
+           - com.yohoufo.dal.order.OrderOverTimeMapper
+           - com.yohoufo.dal.order.BuyerOrderViewMapper
+           - com.yohoufo.dal.order.SellerJoinHistoryMapper
+           - com.yohoufo.dal.order.SellerChangePriceRecordMapper
+           - com.yohoufo.dal.order.InviteActivityMapper
+           - com.yohoufo.dal.order.InviteRecordMapper
+           - com.yohoufo.dal.order.InviterMapper
+           - com.yohoufo.dal.order.InviteSettlementItemMapper
+           - com.yohoufo.dal.order.InviteSettlementMapper
+           - com.yohoufo.dal.order.InviteCodeSequenceMapper
+           - com.yohoufo.dal.order.InviteCodeSequenceRandomMapper
+           - com.yohoufo.dal.order.SellerGoodsStatusFlowMapper
+           - com.yohoufo.dal.order.CmsPayMapper
+           - com.yohoufo.dal.order.OrdersPayHbfqMapper
+           - com.yohoufo.dal.order.BlackUserMapper
+           - com.yohoufo.dal.order.StorageDepositMapper
+           - com.yohoufo.dal.order.DepositOrderMapper
+           - com.yohoufo.dal.order.SellerOrderStatsConfigMapper
+           - com.yohoufo.dal.order.SellerOrderStatsResultMapper
+           - com.yohoufo.dal.order.AlipayBlackUserMapper
+           - com.yohoufo.dal.order.AppraiseOrderMapper
+           - com.yohoufo.dal.order.AppraiseOrderGoodsMapper
+           - com.yohoufo.dal.order.AppraiseOrderMetaMapper
+           - com.yohoufo.dal.order.AppraiseOrderStorageMapper
+           - com.yohoufo.dal.order.DepositCodeMapper
+           - com.yohoufo.dal.order.SellerServiceFeeRuleMapper
+           - com.yohoufo.dal.order.BuyerOrderPromotionMapper
+           - com.yohoufo.dal.order.BuyerChangePriceRecordMapper
 
-  ufo_promotion:
-    servers:
-      - 192.168.102.219:3306
-      - 192.168.102.219:3306
-    username: yh_test
-    password: 9nm0icOwt6bMHjMusIfMLw==
-    daos:
-      - com.yohoufo.dal.promotion.CouponMapper
-      - com.yohoufo.dal.promotion.CouponProductLimitMapper
-      - com.yohoufo.dal.promotion.CouponTypeMapper
-      - com.yohoufo.dal.promotion.UserCouponMapper
-      - com.yohoufo.dal.promotion.IActivityMapper
-      - com.yohoufo.dal.promotion.IActivityProductScopeMapper
-      - com.yohoufo.dal.promotion.IActivityAmountConditionMapper
+   ufo_promotion:
+         servers:
+           - 192.168.102.219:3306
+           - 192.168.102.219:3306
+         username: yh_test
+         password: 9nm0icOwt6bMHjMusIfMLw==
+         daos:
+           - com.yohoufo.dal.promotion.CouponMapper
+           - com.yohoufo.dal.promotion.CouponProductLimitMapper
+           - com.yohoufo.dal.promotion.CouponTypeMapper
+           - com.yohoufo.dal.promotion.UserCouponMapper
+           - com.yohoufo.dal.promotion.IActivityMapper
+           - com.yohoufo.dal.promotion.IActivityProductScopeMapper
+           - com.yohoufo.dal.promotion.IActivityAmountConditionMapper
 
-  ufo_resource:
-    servers:
-      - 192.168.102.219:3306
-      - 192.168.102.219:3306
-    username: yh_test
-    password: 9nm0icOwt6bMHjMusIfMLw==
-    daos:
-      - com.yohoufo.dal.resource.ResourcesContentDataMapper
-      - com.yohoufo.dal.resource.ResourcesContentMapper
-      - com.yohoufo.dal.resource.ResourcesMapper
-      - com.yohoufo.dal.resource.ConfigTypeMapper
-      - com.yohoufo.dal.resource.ResourcesGoodsPoolMapper
+   ufo_resource:
+      servers:
+        - 192.168.102.219:3306
+        - 192.168.102.219:3306
+      username: yh_test
+      password: 9nm0icOwt6bMHjMusIfMLw==
+      daos:
+        - com.yohoufo.dal.resource.ResourcesContentDataMapper
+        - com.yohoufo.dal.resource.ResourcesContentMapper
+        - com.yohoufo.dal.resource.ResourcesMapper
+        - com.yohoufo.dal.resource.ConfigTypeMapper
+        - com.yohoufo.dal.resource.ResourcesGoodsPoolMapper
 
-  line_shops:
-    servers:
-      - 192.168.102.219:3306
-      - 192.168.102.219:3306
-    username: yh_test
-    password: 9nm0icOwt6bMHjMusIfMLw==
-    daos:
-      - com.yohoufo.dal.product.IStoreInfoDAO
-      - com.yohoufo.dal.product.IStoreInfoExtendDAO
+   line_shops:
+       servers:
+         - 192.168.102.219:3306
+         - 192.168.102.219:3306
+       username: yh_test
+       password: 9nm0icOwt6bMHjMusIfMLw==
+       daos:
+         - com.yohoufo.dal.product.IStoreInfoDAO
+         - com.yohoufo.dal.product.IStoreInfoExtendDAO
 
 readOnlyInSlave: true
\ No newline at end of file

@@ -4,16 +4,57 @@ ufo.product.defaultAuthHeadIcon=http://head.static.yhbimg.com/yhb-head/2018/12/2
 ufo.product.defaultUserHeadIcon=http://head.static.yhbimg.com/yhb-head/2018/12/28/14/0160773bb87685aade796ea4f94e0587cf.png?imageView2/{mode}/w/{width}/h/{height}
 
 #UFO propaganda video info
-ufo.order.initVideo            = http://flv01.static.yhbimg.com/ufo/live/mp4/9827059662848_1545892263.mp4
-ufo.order.initVideoPic         = http://img11.static.yhbimg.com/goodsimg/2018/12/28/17/01d30dbfc038ffffc2fc9506dcf9da164f.jpg
+ufo.order.initVideo            = http://flv01.static.yhbimg.com/ufo/live/mp4/9841097408512_1547704777.mp4
+ufo.order.initVideoPic         = http://img11.static.yhbimg.com/goodsimg/2019/01/15/17/01def37377a13f53f359b9b6d8fe7eee8e.png
 ufo.order.initVideoDesc        = \u5ba3\u4f20\u89c6\u9891
 ufo.order.initVideoTime        = 1546272000
 ufo.order.realDesc             = \u9274\u5b9a\u7ed3\u679c\uff1a\u771f
-
+ufo.order.realVideoPic         = http://img11.static.yhbimg.com/goodsimg/2019/01/25/15/01f6c0a2303cfa1957a34b9f8b17e7e746.png
+ufo.order.initVideoShow        = false
+ufo.order.appressVideoShow     = true
 
 #二次发货提醒 108*60 minutes
 ufo.order.sellerDeliverNoticeSecond = 6480
 #发货失败提醒 120*60 minutes
 ufo.order.sellerDeliverNoticeThird = 7200
 #新的发货上线时间  20190129 18:00:00
-ufo.order.sellerDeliverNewOnlineTime = 1548756000
\ No newline at end of file
+ufo.order.sellerDeliverNewOnlineTime = 1548756000
+
+ufo.order.sellerDeliverNewOnlineTimeEx = 1550127600
+ufo.product.productLimitInfo=10009017,10008631,10008633,10008635,10008637,10008639,10008641,10008643,10008645,10008647,10008649,10008651,10008653,10008655,10008657,10008659,10008661,10008663,10008665,10008667,10008669,10008671,10008673,10008675,10008677,10008679,10008681,10008683,10008685,10008687,10008689,10008691,10008693,10008695,10008697,10008699,10008701,10008703,10008705,10008707,10008709,10008711,10008715,10008717,10008719,10008721,10008723,10008725,10008727,10008729,10008731,10008733,10008735,10008737,10008739,10008741,10008743,10008745,10008747,10008749,10008751,10008753,10008755,10008757,10008759,10008761,10008763,10008765,10008767,10008769,10008771,10008773,10008775,10008777,10008779,10008781,10008783,10008785,10008787,10009013,10009015,10009021,10009023,10009025,10009027,10009029,10009031,10009033,10009035,10009037,10009039,10009041,10009043,10009045,10009047,10008789,10008791,10008793,10008795,10008797,10008799,10008801,10008803,10008805,10008807,10008809,10008811,10008813,10008815,10008817,10008819,10008821,10008823,10008825,10008827,10008829,10008831,10008833,10008835,10008837,10008839,10008841,10008843,10008845,10008847,10008849,10008851,10008853,10008855,10008857,10008859,10008861,10008863,10008865,10008867,10008869,10008871,10008873,10008875,10008885,10008887,10008889,10008891,10008893,10008895,10008897,10008899,10008901,10008903,10008905,10008907,10008909,10008911,10008913,10008921,10008923,10008929,10008931,10008933,10008935,10008937,10008939,10008941,10008943,10008945,10008947,10008949,10008951,10008953,10008955,10008957,10008959,10008961,10008963,10008965,10008967,10008969,10008971,10008973,10008975,10008977,10008979,10008981,10008983,10008985,10008987,10008989,10008991,10008993,10008995,10008997,10008999,10009001,10009003,10009005,10009007,10009019,10009049,10009051,10009053,10009055,10009057,10009061,10009063,10009065,10009067
+ufo.seller.rejoinMaxTimes=1
+ufo.invite.isSupportBeenInvited=true
+
+ufo.order.certPhotoSwitchCacheKey=true
+ufo.user.photoCheckLimit=3
+
+#可以自助上架尺码的一级品类配置
+ufo.product.addSizeSortId=40
+
+
+ufo.order.buyer.allow_buy_self_sell_goods=true
+
+ufo.order.seller.hkAccountSettlementAmountLimit=100
+ufo.order.seller.hkAccountSettlementEmailTo=xiuchun.luo@yoho.cn
+ufo.order.seller.noticeHKSellerEmailTo=chao.chen@yoho.cn,xiuchun.luo@yoho.cn
+
+#实名认证开关
+ufo.user.idCertSwitch=false
+
+#实名认证提示版本升级开关
+ufo.user.idCertUpdateVersionSwitch = true
+
+
+#time out
+hystrix.command.wallet.assetWithdrawForPlat.execution.isolation.thread.timeoutInMilliseconds=3000
+
+ufo.order.pay.transferWithWalletSwitch=false
+
+# 寄存转现货开关
+ufo.deposit2Instock.close = true
+
+#验签开关
+gateway.signature.isVerifyAllMethod = true
+
+#闲鱼品类
+ufo.product.xianYuSorts = 40
\ No newline at end of file

@@ -8,18 +8,37 @@
 			<pattern>[%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}] - %-5level [%thread] %logger{35} - %m%n</pattern>
 		</encoder>
 	</appender>
+	<appender name="DEBUG_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
+
+		<file>/Data/logs/ufo-gateway/debug.log</file>
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+			<!-- daily rollover -->
+			<fileNamePattern>/Data/logs/ufo-gateway/archived/debug.%d{yyyy-MM-dd}.%i.log.gz
+			</fileNamePattern>
+			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
+				<!-- or whenever the file size reaches 100MB -->
+				<maxFileSize>100MB</maxFileSize>
+			</timeBasedFileNamingAndTriggeringPolicy>
+			<!-- keep 30 days' worth of history -->
+			<maxHistory>30</maxHistory>
+		</rollingPolicy>
+
+		<encoder>
+			<pattern>[%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}] %d{yyyy-MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger:%line - %msg%n</pattern>
+		</encoder>
+	</appender>
 
 	<!-- 登录时，如果一个IP在一定时间内登录次数过多，记录日志 appender -->
 
 	<appender name="WARN_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
-		<file>/Data/logs/ufo-gateway/debug.log</file>
+		<file>/Data/logs/ufo-gateway/warn.log</file>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
 			<!-- daily rollover -->
 			<fileNamePattern>debug.%d{yyyy-MM-dd}.%i.log.gz
 			</fileNamePattern>
 			<timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
 				<!-- or whenever the file size reaches 100MB -->
-				<maxFileSize>10KB</maxFileSize>
+				<maxFileSize>1000KB</maxFileSize>
 			</timeBasedFileNamingAndTriggeringPolicy>
 			<!-- keep 30 days' worth of history -->
 			<maxHistory>30</maxHistory>

 redis:
     gwNoSyncRedis :
         servers:
-            - 192.168.104.246:6379
\ No newline at end of file
+            - 192.168.104.201:6379

@@ -54,6 +54,11 @@ consumer:
         delay:
           interval: 15
 
+      - class: com.yohoufo.order.mq.consumer.SellerOrderAutoCancelDelayMsgConsumer
+        topic: sellerOrder.autoCancel
+        delay:
+          interval: 2
+
       - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer
         topic: buyerOrder.autoCancel
         delay:

@@ -53,6 +53,11 @@ consumer:
         delay:
           interval: 15
 
+      - class: com.yohoufo.order.mq.consumer.SellerOrderAutoCancelDelayMsgConsumer
+        topic: sellerOrder.autoCancel
+        delay:
+          interval: 2
+
       - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer
         topic: buyerOrder.autoCancel
         delay: