ufo / yohoufo-fore · Commits

Go to a project

Authored by LUOXC
Commit ec013ed787a08fd8d4700612e07a36c506d73c49 2 parents 2251abfc 38708c46

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

Inline Side-by-side
Showing 25 changed files with 399 additions and 224 deletions
@@ -25,6 +25,8 @@ public interface DelayTime { @@ -25,6 +25,8 @@ public interface DelayTime {
25 25
26 int SELLER_ORDER_WAITING_PAY = 15; 26 int SELLER_ORDER_WAITING_PAY = 15;
27 27
  28 + int SELLER_BID_ORDER_WAITING_PYY = 2;
  29 +
28 //瑕疵等待用户确认的超时时间，24小时 30 //瑕疵等待用户确认的超时时间，24小时
29 //修改为48小时 2019-03-01 craig.qin 31 //修改为48小时 2019-03-01 craig.qin
30 int MINI_FAULT_CONFIRM_OUTER_TIME_MINUTE=48*60; 32 int MINI_FAULT_CONFIRM_OUTER_TIME_MINUTE=48*60;
@@ -25,7 +25,7 @@ public class BuyerOrderPayDiffTimeHandler { @@ -25,7 +25,7 @@ public class BuyerOrderPayDiffTimeHandler {
25 OrdersPay ordersPay = ordersPayMapper.selectOrdersPayByPayLevel(orderCode, buyerUid, payLevel); 25 OrdersPay ordersPay = ordersPayMapper.selectOrdersPayByPayLevel(orderCode, buyerUid, payLevel);
26 Integer payTime; 26 Integer payTime;
27 if (Objects.isNull(ordersPay) || Objects.isNull(payTime = ordersPay.getCreateTime())) { 27 if (Objects.isNull(ordersPay) || Objects.isNull(payTime = ordersPay.getCreateTime())) {
28 - logger.warn("in calBuyerPenalty not exist paid record.orderCode {}", orderCode); 28 + logger.warn("in calBuyerPenalty not exist paid record.orderCode {},payLevel {}", orderCode, payLevel);
29 throw new ServiceException(ServiceError.ORDER_HAS_NOT_PAID); 29 throw new ServiceException(ServiceError.ORDER_HAS_NOT_PAID);
30 } 30 }
31 int currentTime = DateUtil.getCurrentTimeSecond(); 31 int currentTime = DateUtil.getCurrentTimeSecond();
@@ -424,6 +424,7 @@ public abstract class AbsOrderListService extends AbsOrderViewService implements @@ -424,6 +424,7 @@ public abstract class AbsOrderListService extends AbsOrderViewService implements
424 // 当订单状态是待付款, 显示leftTime 424 // 当订单状态是待付款, 显示leftTime
425 OrderAttributes oa = OrderAttributes.getOrderAttributes(buyerOrder.getAttributes()); 425 OrderAttributes oa = OrderAttributes.getOrderAttributes(buyerOrder.getAttributes());
426 TimeoutBo timeoutBo = calTimeout(tabType, buyerOrder.getUid(), buyerOrder.getOrderCode(), 426 TimeoutBo timeoutBo = calTimeout(tabType, buyerOrder.getUid(), buyerOrder.getOrderCode(),
  427 + buyerOrder.getBidType(),
427 buyerOrder.getStatus(), buyerOrder.getCreateTime(), oa); 428 buyerOrder.getStatus(), buyerOrder.getCreateTime(), oa);
428 return timeoutBo; 429 return timeoutBo;
429 } 430 }
@@ -135,12 +135,12 @@ public abstract class AbsOrderViewService { @@ -135,12 +135,12 @@ public abstract class AbsOrderViewService {
135 } 135 }
136 136
137 137
138 - public TimeoutBo calTimeout(TabType actor, Integer uid, Long orderCode, 138 + public TimeoutBo calTimeout(TabType actor, Integer uid, Long orderCode,int bidType,
139 Integer orderStatus, Integer createTime, OrderAttributes oa){ 139 Integer orderStatus, Integer createTime, OrderAttributes oa){
140 TimeoutBo timeoutBo = new TimeoutBo(); 140 TimeoutBo timeoutBo = new TimeoutBo();
141 OrderTimeoutContext otctx = OrderTimeoutContext.builder() 141 OrderTimeoutContext otctx = OrderTimeoutContext.builder()
142 .actor(actor).uid(uid).orderCode(orderCode) 142 .actor(actor).uid(uid).orderCode(orderCode)
143 - .orderStatus(orderStatus).createTime(createTime).oa(oa).build(); 143 + .orderStatus(orderStatus).createTime(createTime).oa(oa).bidType(bidType).build();
144 TimeoutWrapper tw = orderTimeoutFactory.create(otctx); 144 TimeoutWrapper tw = orderTimeoutFactory.create(otctx);
145 Integer leftTime = null; 145 Integer leftTime = null;
146 //特殊场景 orders_pay无记录时，timeoutBo = null 146 //特殊场景 orders_pay无记录时，timeoutBo = null
@@ -192,6 +192,7 @@ public abstract class AbsOrderViewService { @@ -192,6 +192,7 @@ public abstract class AbsOrderViewService {
192 return detailItem.getTimeoutBo(); 192 return detailItem.getTimeoutBo();
193 } else { 193 } else {
194 return calTimeout(TabType.BUY, uid, orderCode, 194 return calTimeout(TabType.BUY, uid, orderCode,
  195 + bidType,
195 orderStatusCode, 196 orderStatusCode,
196 statusStartTime, oa); 197 statusStartTime, oa);
197 } 198 }
@@ -104,13 +104,6 @@ public class BuyerBidPriceService { @@ -104,13 +104,6 @@ public class BuyerBidPriceService {
104 //校验 104 //校验
105 context.validate(true); 105 context.validate(true);
106 106
107 - int oldSkup = context.sellerOrderGoods.getId();  
108 - logger.info("[{}] will change price,orderCode:{},oldSkup:{}", uid, context.buyerOrder.getOrderCode(), oldSkup);  
109 -  
110 - //调价前将原skup取消，若生成新skup失败，则需要手动恢复原skup  
111 - bidProductProxyService.cancelSaleBeforeChangePrice(oldSkup);  
112 - logger.info("[{}] was canceled success", oldSkup);  
113 -  
114 //构建参数 107 //构建参数
115 BuyerBidPublishRequest req = BuyerBidPublishRequest.builder().uid(uid) 108 BuyerBidPublishRequest req = BuyerBidPublishRequest.builder().uid(uid)
116 .storageId(context.sellerOrderGoods.getStorageId()) 109 .storageId(context.sellerOrderGoods.getStorageId())
@@ -120,7 +113,19 @@ public class BuyerBidPriceService { @@ -120,7 +113,19 @@ public class BuyerBidPriceService {
120 .userAddressPair(context.userAddressPair) 113 .userAddressPair(context.userAddressPair)
121 .businessClient(request.getBusinessClient()) 114 .businessClient(request.getBusinessClient())
122 .build(); 115 .build();
123 - BidPublishResult bidPublishResult = buyerBidPublishService.bidPublish(req); 116 + //先计算
  117 + BuyerBidPublishService.BidComputeResult bidComputeResult = buyerBidPublishService.doCompute(req);
  118 +
  119 + //计算无问题，锁定oldSkup
  120 + int oldSkup = context.sellerOrderGoods.getId();
  121 + logger.info("[{}] will change price,orderCode:{},oldSkup:{}", uid, context.buyerOrder.getOrderCode(), oldSkup);
  122 +
  123 + //调价前将原skup取消，若生成新skup失败，则需要手动恢复原skup
  124 + bidProductProxyService.cancelSaleBeforeChangePrice(oldSkup);
  125 + logger.info("[{}] was canceled success", oldSkup);
  126 +
  127 + //发布
  128 + BidPublishResult bidPublishResult = buyerBidPublishService.doBidPublish(req,bidComputeResult);
124 try { 129 try {
125 //记录变价明细 130 //记录变价明细
126 recordChangePriceDetail(context, bidPublishResult); 131 recordChangePriceDetail(context, bidPublishResult);
@@ -31,7 +31,6 @@ import com.yohoufo.order.model.response.BidPrePublishResponse; @@ -31,7 +31,6 @@ import com.yohoufo.order.model.response.BidPrePublishResponse;
31 import com.yohoufo.order.model.response.BidPublishResponse; 31 import com.yohoufo.order.model.response.BidPublishResponse;
32 import com.yohoufo.order.mq.DelayTime; 32 import com.yohoufo.order.mq.DelayTime;
33 import com.yohoufo.order.mq.TopicConstants; 33 import com.yohoufo.order.mq.TopicConstants;
34 -import com.yohoufo.order.service.BuyerOrderStateChangers;  
35 import com.yohoufo.order.service.cache.CacheCleaner; 34 import com.yohoufo.order.service.cache.CacheCleaner;
36 import com.yohoufo.order.service.cache.CacheKeyBuilder; 35 import com.yohoufo.order.service.cache.CacheKeyBuilder;
37 import com.yohoufo.order.service.listener.BuyerOrderChangeEvent; 36 import com.yohoufo.order.service.listener.BuyerOrderChangeEvent;
@@ -101,9 +100,6 @@ public class BuyerBidPublishService { @@ -101,9 +100,6 @@ public class BuyerBidPublishService {
101 @Autowired 100 @Autowired
102 private OrderChangeListenerContainer orderChangeListenerContainer; 101 private OrderChangeListenerContainer orderChangeListenerContainer;
103 102
104 - @Autowired  
105 - private BuyerOrderStateChangers buyerOrderStateChangers;  
106 -  
107 103
108 /** 104 /**
109 * 计算 105 * 计算
@@ -112,22 +108,11 @@ public class BuyerBidPublishService { @@ -112,22 +108,11 @@ public class BuyerBidPublishService {
112 * 2.商品金额 + 运费 108 * 2.商品金额 + 运费
113 */ 109 */
114 public BidComputeResponse compute(BuyerBidPublishRequest request) { 110 public BidComputeResponse compute(BuyerBidPublishRequest request) {
115 - int uid = request.getUid();  
116 - //1.校验如下规则  
117 - //1.1 sku必须存在的  
118 - //1.2求购价格满足商品的最低和最高红线价，不满足提示价格过低,或者价格过高  
119 - //求购金额  
120 - BuyerBidConfig buyerBidConfig = metaConfigService.getBuyerBidConfig();  
121 - BidAndSuggestPrice bidPrice = new BidAndSuggestPrice(request.getPrice(),  
122 - productProxyService.getPrdPriceRange(request.getUid(), request.getStorageId()),  
123 - buyerBidConfig.getBasConfig());  
124 - //2.计算定金  
125 - Deposit deposit = computeDeposit(bidPrice, buyerBidConfig.getDConfig());  
126 - logger.info("[{}] buyerBid compute deposit result:{}", uid, deposit);  
127 -  
128 - //3.计算商品金额 + 运费  
129 - ChargeContext chargeContext = computeGoods(request, bidPrice); 111 + //计算
  112 + BidComputeResult bidComputeResult = doCompute(request);
130 113
  114 + Deposit deposit = bidComputeResult.deposit;
  115 + ChargeContext chargeContext = bidComputeResult.chargeContext;
131 //算费结果 116 //算费结果
132 ChargeResult chargeResult = chargeContext.getChargeResult(); 117 ChargeResult chargeResult = chargeContext.getChargeResult();
133 //返回结果 118 //返回结果
@@ -249,6 +234,11 @@ public class BuyerBidPublishService { @@ -249,6 +234,11 @@ public class BuyerBidPublishService {
249 * @return 234 * @return
250 */ 235 */
251 public BidPublishResult bidPublish(BuyerBidPublishRequest request) { 236 public BidPublishResult bidPublish(BuyerBidPublishRequest request) {
  237 + BidComputeResult bidComputeResult = doCompute(request);
  238 + return doBidPublish(request,bidComputeResult);
  239 + }
  240 +
  241 + public BidComputeResult doCompute(BuyerBidPublishRequest request) {
252 int uid = request.getUid(); 242 int uid = request.getUid();
253 int storageId = request.getStorageId(); 243 int storageId = request.getStorageId();
254 //1.校验如下规则 244 //1.校验如下规则
@@ -264,6 +254,21 @@ public class BuyerBidPublishService { @@ -264,6 +254,21 @@ public class BuyerBidPublishService {
264 //3.计算商品金额 + 运费 254 //3.计算商品金额 + 运费
265 ChargeContext chargeContext = computeGoods(request, bidPrice); 255 ChargeContext chargeContext = computeGoods(request, bidPrice);
266 256
  257 + return new BidComputeResult(buyerBidConfig, bidPrice, deposit, chargeContext);
  258 + }
  259 +
  260 + /**
  261 + * 发布
  262 + * @param request
  263 + * @param bidComputeResult
  264 + * @return
  265 + */
  266 + public BidPublishResult doBidPublish(BuyerBidPublishRequest request, BidComputeResult bidComputeResult) {
  267 + int uid = request.getUid();
  268 + int storageId = request.getStorageId();
  269 + BidAndSuggestPrice bidPrice = bidComputeResult.bidPrice;
  270 + Deposit deposit = bidComputeResult.deposit;
  271 + ChargeContext chargeContext = bidComputeResult.chargeContext;
267 //获取商品信息 272 //获取商品信息
268 GoodsInfo goodsInfo = skupService.getProductDetail(uid, storageId, bidPrice.getPrice(), SkupType.getSkupType(request.getSkupType())); 273 GoodsInfo goodsInfo = skupService.getProductDetail(uid, storageId, bidPrice.getPrice(), SkupType.getSkupType(request.getSkupType()));
269 274
@@ -300,6 +305,7 @@ public class BuyerBidPublishService { @@ -300,6 +305,7 @@ public class BuyerBidPublishService {
300 } 305 }
301 306
302 307
  308 +
303 /** 309 /**
304 * skup 发布 310 * skup 发布
305 * 记录到seller_order_goods中 311 * 记录到seller_order_goods中
@@ -365,4 +371,18 @@ public class BuyerBidPublishService { @@ -365,4 +371,18 @@ public class BuyerBidPublishService {
365 return request.getUserAddressPair(); 371 return request.getUserAddressPair();
366 } 372 }
367 } 373 }
  374 +
  375 + public class BidComputeResult {
  376 + BuyerBidConfig buyerBidConfig;
  377 + BidAndSuggestPrice bidPrice;
  378 + Deposit deposit;
  379 + ChargeContext chargeContext;
  380 +
  381 + public BidComputeResult(BuyerBidConfig buyerBidConfig, BidAndSuggestPrice bidPrice, Deposit deposit, ChargeContext chargeContext) {
  382 + this.buyerBidConfig = buyerBidConfig;
  383 + this.bidPrice = bidPrice;
  384 + this.deposit = deposit;
  385 + this.chargeContext = chargeContext;
  386 + }
  387 + }
368 } 388 }
@@ -223,6 +223,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO @@ -223,6 +223,7 @@ public class BuyerOrderDetailService extends AbsOrderDetailService implements IO
223 // 待付款时，剩余时间 223 // 待付款时，剩余时间
224 TimeoutBo timeoutBo = calTimeout(tabType, buyerOrder.getUid(), 224 TimeoutBo timeoutBo = calTimeout(tabType, buyerOrder.getUid(),
225 buyerOrder.getOrderCode(), orderStatus.getCode(), 225 buyerOrder.getOrderCode(), orderStatus.getCode(),
  226 + buyerOrder.getBidType(),
226 buyerOrder.getCreateTime(), oa); 227 buyerOrder.getCreateTime(), oa);
227 if (Objects.nonNull(timeoutBo)) { 228 if (Objects.nonNull(timeoutBo)) {
228 statusDetail.setLeftTime(timeoutBo.getLeftTime()); 229 statusDetail.setLeftTime(timeoutBo.getLeftTime());
@@ -1483,7 +1483,10 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -1483,7 +1483,10 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
1483 1483
1484 CodeMeta codeMeta = orderCodeGenerator.expId(orderCode); 1484 CodeMeta codeMeta = orderCodeGenerator.expId(orderCode);
1485 OrderCodeType orderCodeType = OrderCodeType.getOrderCodeType(codeMeta.getType()); 1485 OrderCodeType orderCodeType = OrderCodeType.getOrderCodeType(codeMeta.getType());
1486 - 1486 + final BusinessClientEnum bce = OrderAssist.findBusinessClient(businessClient);
  1487 + String clientName = OrderAssist.matchClientName(bce);
  1488 + Supplier<String> commonDeliverDescSupplier = () -> formatDeliverDesc(SellerConfig.DeliverDesc.COMMON, clientName);
  1489 + Supplier<String> warnTipsSupplier = () -> formatWarnTips(SellerConfig.WarnTips.BUYER_ORDER, clientName);
1487 AppraiseAddressResp resp = null; 1490 AppraiseAddressResp resp = null;
1488 if (OrderCodeType.GOODS_SERVICE.equals(orderCodeType)){ 1491 if (OrderCodeType.GOODS_SERVICE.equals(orderCodeType)){
1489 ServiceOrderProcessor.ExistenceNode existenceNode = serviceOrderProcessor.isAppraiseOrder(orderCode); 1492 ServiceOrderProcessor.ExistenceNode existenceNode = serviceOrderProcessor.isAppraiseOrder(orderCode);
@@ -1512,17 +1515,15 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -1512,17 +1515,15 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
1512 1515
1513 if (isHKLargeSettlementSuper(uid)) { 1516 if (isHKLargeSettlementSuper(uid)) {
1514 resp = appraiseAddressService.queryHKAppraiseAddress(); 1517 resp = appraiseAddressService.queryHKAppraiseAddress();
1515 - resp.setDeliverDesc(SellerConfig.DeliverDesc.COMMON);  
1516 - resp.setWarnTips(SellerConfig.WarnTips.BUYER_ORDER); 1518 + resp.setDeliverDesc(commonDeliverDescSupplier.get());
  1519 + resp.setWarnTips(warnTipsSupplier.get());
1517 return resp; 1520 return resp;
1518 } 1521 }
1519 - final BusinessClientEnum bce = OrderAssist.findBusinessClient(businessClient);  
1520 - String clientName = OrderAssist.matchClientName(bce); 1522 +
1521 1523
1522 //寄存订单 1524 //寄存订单
1523 BuyerOrder buyerOrder = buyerOrderMapper.selectOnlyByOrderCode(orderCode); 1525 BuyerOrder buyerOrder = buyerOrderMapper.selectOnlyByOrderCode(orderCode);
1524 - Supplier<String> commonDeliverDescSupplier = () -> formatDeliverDesc(SellerConfig.DeliverDesc.COMMON, clientName);  
1525 - Supplier<String> warnTipsSupplier = () -> formatWarnTips(SellerConfig.WarnTips.BUYER_ORDER, clientName); 1526 +
1526 //防止较早版本出错 1527 //防止较早版本出错
1527 if (Objects.nonNull(buyerOrder)) { 1528 if (Objects.nonNull(buyerOrder)) {
1528 if (OrderAttributes.DEPOSITE.getCode() == buyerOrder.getAttributes()) { 1529 if (OrderAttributes.DEPOSITE.getCode() == buyerOrder.getAttributes()) {
@@ -177,7 +177,7 @@ public class SellerBidPublishService { @@ -177,7 +177,7 @@ public class SellerBidPublishService {
177 EventBusPublisher.publishEvent(SellerBidOrderPaySuccessEvent.builder().uid(uid).skup(skup).build()); 177 EventBusPublisher.publishEvent(SellerBidOrderPaySuccessEvent.builder().uid(uid).skup(skup).build());
178 } else { 178 } else {
179 OrderCancelEvent orderCancelEvent = OrderCancelEvent.builder().uid(uid) 179 OrderCancelEvent orderCancelEvent = OrderCancelEvent.builder().uid(uid)
180 - .orderCode(orderCode).payExpire(DelayTime.SELLER_ORDER_WAITING_PAY) 180 + .orderCode(orderCode).payExpire(DelayTime.SELLER_BID_ORDER_WAITING_PYY)
181 .actorType(TabType.SELL).cancelType(CancelType.TIME_OUT).build(); 181 .actorType(TabType.SELL).cancelType(CancelType.TIME_OUT).build();
182 EventBusPublisher.publishEvent(orderCancelEvent); 182 EventBusPublisher.publishEvent(orderCancelEvent);
183 } 183 }
@@ -307,11 +307,14 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -307,11 +307,14 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
307 * @return 307 * @return
308 */ 308 */
309 private OrderDetailInfo.StatusDetail getStatusDetail(SellerOrder order, 309 private OrderDetailInfo.StatusDetail getStatusDetail(SellerOrder order,
  310 + int bidType,
310 SkupStatus skupStatus) { 311 SkupStatus skupStatus) {
  312 +
  313 +
311 OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail.builder() 314 OrderDetailInfo.StatusDetail statusDetail = OrderDetailInfo.StatusDetail.builder()
312 .status(skupStatus.getCode()) 315 .status(skupStatus.getCode())
313 .statuStr(skupStatus.getDesc()) 316 .statuStr(skupStatus.getDesc())
314 - .detailDesc(skupStatus.getDetailShowDesc()) 317 + .detailDesc(skupStatus.getDetailShowDesc(String.valueOf(bidType == OrderConstant.BUYER_BID_TYPE ? OrderInfo.SELLER_BID_PAY_TIMEOUT/60 : OrderInfo.SELLER_PAY_TIMEOUT/60)))
315 .paymentTips(skupStatus.getPaymentTips()) 318 .paymentTips(skupStatus.getPaymentTips())
316 .build(); 319 .build();
317 320
@@ -320,6 +323,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -320,6 +323,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
320 .createTime(order.getCreateTime()) 323 .createTime(order.getCreateTime())
321 .orderCodeType(OrderCodeType.SELLER_TYPE) 324 .orderCodeType(OrderCodeType.SELLER_TYPE)
322 .orderStatus(skupStatus.getCode()) 325 .orderStatus(skupStatus.getCode())
  326 + .bidType(bidType)
323 .calculatePayLeftTime(); 327 .calculatePayLeftTime();
324 Integer leftTime = timeoutBo.getLeftTime(); 328 Integer leftTime = timeoutBo.getLeftTime();
325 statusDetail.setLeftTime(leftTime); 329 statusDetail.setLeftTime(leftTime);
@@ -374,8 +378,10 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -374,8 +378,10 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
374 OrderDetailInfo orderDetailInfo = new OrderDetailInfo(); 378 OrderDetailInfo orderDetailInfo = new OrderDetailInfo();
375 orderDetailInfo.setUid(order.getUid()); 379 orderDetailInfo.setUid(order.getUid());
376 orderDetailInfo.setOrderCode(getOrderCode(skupStatus, order)); 380 orderDetailInfo.setOrderCode(getOrderCode(skupStatus, order));
  381 + //求购订单类型
  382 + orderDetailInfo.setBidType(sellerOrderGoods.getBidType());
377 Integer storageNum = sellerOrderGoods.getNum(); 383 Integer storageNum = sellerOrderGoods.getNum();
378 - Integer leftTime = TimeUtils.calLeftTime(OrderInfo.SELLER_PAY_TIMEOUT, order.getCreateTime()); 384 + Integer leftTime = TimeUtils.calLeftTime(sellerOrderGoods.isBidSkup() ? OrderInfo.SELLER_BID_PAY_TIMEOUT : OrderInfo.SELLER_PAY_TIMEOUT, order.getCreateTime());
379 Integer soga = sellerOrderGoods.getAttributes(); 385 Integer soga = sellerOrderGoods.getAttributes();
380 SkupType skupType = SkupType.getSkupType(soga); 386 SkupType skupType = SkupType.getSkupType(soga);
381 387
@@ -391,7 +397,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -391,7 +397,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
391 orderDetailInfo.setUserAddress(addressInfo); 397 orderDetailInfo.setUserAddress(addressInfo);
392 //卖家 398 //卖家
393 assembleSoldPrdCompute(orderDetailInfo, order.getUid(), sellerOrderGoods.getId()); 399 assembleSoldPrdCompute(orderDetailInfo, order.getUid(), sellerOrderGoods.getId());
394 - OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(order, skupStatus); 400 + OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(order, sellerOrderGoods.getBidType(), skupStatus);
395 401
396 orderDetailInfo.setAttributes(soga); 402 orderDetailInfo.setAttributes(soga);
397 403
@@ -495,7 +501,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -495,7 +501,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
495 Long orderCode = buyerOrder.getOrderCode(); 501 Long orderCode = buyerOrder.getOrderCode();
496 int orderStatusCode = orderStatus.getCode(); 502 int orderStatusCode = orderStatus.getCode();
497 Integer createTime = buyerOrder.getCreateTime(); 503 Integer createTime = buyerOrder.getCreateTime();
498 - TimeoutBo timeoutBo = calTimeout(tabType, buyerUid, orderCode, orderStatusCode, createTime, oa); 504 + TimeoutBo timeoutBo = calTimeout(tabType, buyerUid, orderCode,buyerOrder.getBidType(), orderStatusCode, createTime, oa);
499 if (Objects.nonNull(timeoutBo)) { 505 if (Objects.nonNull(timeoutBo)) {
500 statusDetail.setLeftTime(timeoutBo.getLeftTime()); 506 statusDetail.setLeftTime(timeoutBo.getLeftTime());
501 } 507 }
@@ -594,6 +600,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -594,6 +600,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
594 orderStatus = orderDetailInfo.getStatusDetail().getStatus(); 600 orderStatus = orderDetailInfo.getStatusDetail().getStatus();
595 Integer createTime = orderDetailInfo.getSecendLevelCreateTime(); 601 Integer createTime = orderDetailInfo.getSecendLevelCreateTime();
596 timeoutBo = calTimeout(TabType.SELL, buyerUid, orderCode, 602 timeoutBo = calTimeout(TabType.SELL, buyerUid, orderCode,
  603 + orderDetailInfo.getBidType(),
597 orderStatus, createTime, oa); 604 orderStatus, createTime, oa);
598 } 605 }
599 Integer leftTime = timeoutBo.getLeftTime(); 606 Integer leftTime = timeoutBo.getLeftTime();
@@ -639,7 +646,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I @@ -639,7 +646,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
639 SellerOrderGoods sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(skup); 646 SellerOrderGoods sellerOrderGoods = sellerOrderGoodsMapper.selectByPrimaryKey(skup);
640 SkupStatus skupStatus = SkupStatus.getSkupStatus(sellerOrderGoods.getStatus()); 647 SkupStatus skupStatus = SkupStatus.getSkupStatus(sellerOrderGoods.getStatus());
641 648
642 - OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(sellerOrder, skupStatus); 649 + OrderDetailInfo.StatusDetail statusDetail = getStatusDetail(sellerOrder,sellerOrderGoods.getBidType(), skupStatus);
643 OrderDetailInfo orderDetailInfo = new OrderDetailInfo(); 650 OrderDetailInfo orderDetailInfo = new OrderDetailInfo();
644 651
645 orderDetailInfo.setOrderCode(orderCode); 652 orderDetailInfo.setOrderCode(orderCode);
@@ -203,6 +203,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde @@ -203,6 +203,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
203 TimeoutBo timeoutBo = new SellerOrderTimeoutWrapper().createTime(oli.getSecendLevelCreateTime()) 203 TimeoutBo timeoutBo = new SellerOrderTimeoutWrapper().createTime(oli.getSecendLevelCreateTime())
204 .orderCodeType(orderCodeType) 204 .orderCodeType(orderCodeType)
205 .orderStatus(orderStatus) 205 .orderStatus(orderStatus)
  206 + .bidType(oli.getBidType())
206 .calculatePayLeftTime(); 207 .calculatePayLeftTime();
207 oli.setLeftTime(timeoutBo.getLeftTime()); 208 oli.setLeftTime(timeoutBo.getLeftTime());
208 oli.setTimeLimit(timeoutBo.getTimelimit()); 209 oli.setTimeLimit(timeoutBo.getTimelimit());
@@ -253,11 +254,12 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde @@ -253,11 +254,12 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
253 // 订单中状态显示 254 // 订单中状态显示
254 orderListInfo.setStatus(skupStatus.getCode()); 255 orderListInfo.setStatus(skupStatus.getCode());
255 orderListInfo.setStatuStr(skupStatus.getDesc()); 256 orderListInfo.setStatuStr(skupStatus.getDesc());
  257 + orderListInfo.setBidType(sellerOrderGoods.getBidType());
256 Integer storageNum = sellerOrderGoods.getNum(); 258 Integer storageNum = sellerOrderGoods.getNum();
257 259
258 // 当订单状态是待付款, 显示leftTime 260 // 当订单状态是待付款, 显示leftTime
259 if (sellerOrderGoods.getStatus() == SkupStatus.CAN_NOT_SELL.getCode()){ 261 if (sellerOrderGoods.getStatus() == SkupStatus.CAN_NOT_SELL.getCode()){
260 - int payTimeLimit = OrderInfo.SELLER_PAY_TIMEOUT; 262 + int payTimeLimit = sellerOrderGoods.isBidSkup() ? OrderInfo.SELLER_BID_PAY_TIMEOUT : OrderInfo.SELLER_PAY_TIMEOUT;
261 orderListInfo.setLeftTime(TimeUtils.calLeftTime(payTimeLimit, sellerOrder.getCreateTime())); 263 orderListInfo.setLeftTime(TimeUtils.calLeftTime(payTimeLimit, sellerOrder.getCreateTime()));
262 orderListInfo.setTimeLimit(payTimeLimit); 264 orderListInfo.setTimeLimit(payTimeLimit);
263 } 265 }
@@ -783,8 +783,10 @@ public class SellerOrderCancelService { @@ -783,8 +783,10 @@ public class SellerOrderCancelService {
783 } 783 }
784 if (SellerOrderStatus.WAITING_PAY.getCode() == status){ 784 if (SellerOrderStatus.WAITING_PAY.getCode() == status){
785 //send msg to mq system 785 //send msg to mq system
786 - event.setPayExpire(DelayTime.SELLER_ORDER_WAITING_PAY);  
787 - tradeMqSender.send(TopicConstants.SELLER_ORDER_AUTO_CANCEL, event , DelayTime.SELLER_ORDER_WAITING_PAY); 786 + if (event.getPayExpire() <= 0) {
  787 + event.setPayExpire(DelayTime.SELLER_ORDER_WAITING_PAY);
  788 + }
  789 + tradeMqSender.send(TopicConstants.SELLER_ORDER_AUTO_CANCEL, event , event.getPayExpire());
788 } 790 }
789 } 791 }
790 792
@@ -92,7 +92,7 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService { @@ -92,7 +92,7 @@ public class SellerDepositOrderDetailService extends AbsOrderViewService {
92 OrderAttributes oa = OrderAttributes.getOrderAttributes(pao.getAttributes()); 92 OrderAttributes oa = OrderAttributes.getOrderAttributes(pao.getAttributes());
93 93
94 // 94 //
95 - TimeoutBo timeout = calTimeout(TabType.BUY, uid, orderCode, pao.getStatus(), 95 + TimeoutBo timeout = calTimeout(TabType.BUY, uid, orderCode,0, pao.getStatus(),
96 pao.getCreateTime(), oa); 96 pao.getCreateTime(), oa);
97 97
98 ExpressInfoDetail lastExpressInfoDetail = expressInfoService.getLastExpressInfoDetail(pao); 98 ExpressInfoDetail lastExpressInfoDetail = expressInfoService.getLastExpressInfoDetail(pao);
@@ -123,7 +123,7 @@ public class SellerDepositOrderListService extends AbsOrderViewService { @@ -123,7 +123,7 @@ public class SellerDepositOrderListService extends AbsOrderViewService {
123 .build()) 123 .build())
124 .collect(Collectors.toCollection(()->new ArrayList<>(aogList.size()))); 124 .collect(Collectors.toCollection(()->new ArrayList<>(aogList.size())));
125 125
126 - TimeoutBo timeout = calTimeout(TabType.BUY, uid, orderCode, pao.getStatus(), 126 + TimeoutBo timeout = calTimeout(TabType.BUY, uid, orderCode,0, pao.getStatus(),
127 pao.getCreateTime(), oa); 127 pao.getCreateTime(), oa);
128 return SellerDepositOrderListResp.builder() 128 return SellerDepositOrderListResp.builder()
129 .uid(uid) 129 .uid(uid)
@@ -35,4 +35,6 @@ public class OrderTimeoutContext { @@ -35,4 +35,6 @@ public class OrderTimeoutContext {
35 Integer payTime; 35 Integer payTime;
36 36
37 OrderAttributes oa; 37 OrderAttributes oa;
  38 +
  39 + int bidType;
38 } 40 }
@@ -27,6 +27,7 @@ public class OrderTimeoutFactory { @@ -27,6 +27,7 @@ public class OrderTimeoutFactory {
27 Integer orderStatus = otctx.orderStatus; 27 Integer orderStatus = otctx.orderStatus;
28 Integer createTime = otctx.createTime; 28 Integer createTime = otctx.createTime;
29 OrderAttributes oa = otctx.oa; 29 OrderAttributes oa = otctx.oa;
  30 + int bidType = otctx.bidType;
30 31
31 boolean isBuyer = actor.equals(TabType.BUY); 32 boolean isBuyer = actor.equals(TabType.BUY);
32 boolean isSeller = actor.equals(TabType.SELL); 33 boolean isSeller = actor.equals(TabType.SELL);
@@ -59,7 +60,8 @@ public class OrderTimeoutFactory { @@ -59,7 +60,8 @@ public class OrderTimeoutFactory {
59 tow = new SellerOrderTimeoutWrapper() 60 tow = new SellerOrderTimeoutWrapper()
60 .orderCodeType(orderCodeType) 61 .orderCodeType(orderCodeType)
61 .orderStatus(orderStatus) 62 .orderStatus(orderStatus)
62 - .createTime(createTime); 63 + .createTime(createTime)
  64 + .bidType(bidType);
63 } 65 }
64 isPaid = orderStatus == OrderStatus.HAS_PAYED.getCode(); 66 isPaid = orderStatus == OrderStatus.HAS_PAYED.getCode();
65 if (isPaid){ 67 if (isPaid){
@@ -76,6 +78,7 @@ public class OrderTimeoutFactory { @@ -76,6 +78,7 @@ public class OrderTimeoutFactory {
76 .orderCodeType(orderCodeType) 78 .orderCodeType(orderCodeType)
77 .orderStatus(orderStatus) 79 .orderStatus(orderStatus)
78 .createTime(createTime) 80 .createTime(createTime)
  81 + .bidType(bidType)
79 ; 82 ;
80 } 83 }
81 } 84 }
@@ -5,6 +5,7 @@ import com.yohobuy.ufo.model.order.bo.TimeoutBo; @@ -5,6 +5,7 @@ import com.yohobuy.ufo.model.order.bo.TimeoutBo;
5 import com.yohobuy.ufo.model.order.common.OrderCodeType; 5 import com.yohobuy.ufo.model.order.common.OrderCodeType;
6 import com.yohobuy.ufo.model.order.common.OrderStatus; 6 import com.yohobuy.ufo.model.order.common.OrderStatus;
7 import com.yohobuy.ufo.model.order.common.SkupStatus; 7 import com.yohobuy.ufo.model.order.common.SkupStatus;
  8 +import com.yohobuy.ufo.model.order.constants.OrderConstant;
8 import com.yohobuy.ufo.model.order.constants.TimeoutCase; 9 import com.yohobuy.ufo.model.order.constants.TimeoutCase;
9 import com.yohoufo.order.mq.DelayTime; 10 import com.yohoufo.order.mq.DelayTime;
10 11
@@ -20,6 +21,7 @@ public class SellerOrderTimeoutWrapper extends AbsTimeoutWrapper{ @@ -20,6 +21,7 @@ public class SellerOrderTimeoutWrapper extends AbsTimeoutWrapper{
20 private OrderCodeType orderCodeType; 21 private OrderCodeType orderCodeType;
21 private Integer orderStatus; 22 private Integer orderStatus;
22 private int createTime; 23 private int createTime;
  24 + private int bidType;
23 25
24 public SellerOrderTimeoutWrapper orderCodeType(OrderCodeType orderCodeType){ 26 public SellerOrderTimeoutWrapper orderCodeType(OrderCodeType orderCodeType){
25 this.orderCodeType = orderCodeType; 27 this.orderCodeType = orderCodeType;
@@ -36,6 +38,15 @@ public class SellerOrderTimeoutWrapper extends AbsTimeoutWrapper{ @@ -36,6 +38,15 @@ public class SellerOrderTimeoutWrapper extends AbsTimeoutWrapper{
36 return this; 38 return this;
37 } 39 }
38 40
  41 + public SellerOrderTimeoutWrapper bidType(int bidType) {
  42 + this.bidType = bidType;
  43 + return this;
  44 + }
  45 +
  46 + public boolean isBidType() {
  47 + return bidType == OrderConstant.BUYER_BID_TYPE;
  48 + }
  49 +
39 /** 50 /**
40 * 51 *
41 * @return 52 * @return
@@ -61,7 +72,7 @@ public class SellerOrderTimeoutWrapper extends AbsTimeoutWrapper{ @@ -61,7 +72,7 @@ public class SellerOrderTimeoutWrapper extends AbsTimeoutWrapper{
61 //查看卖家 72 //查看卖家
62 if (orderCodeType == OrderCodeType.SELLER_TYPE){ 73 if (orderCodeType == OrderCodeType.SELLER_TYPE){
63 isWaitingPay = orderStatus == SkupStatus.CAN_NOT_SELL.getCode(); 74 isWaitingPay = orderStatus == SkupStatus.CAN_NOT_SELL.getCode();
64 - if (isWaitingPay)timeout = OrderInfo.SELLER_PAY_TIMEOUT; 75 + if (isWaitingPay) timeout = isBidType() ? OrderInfo.SELLER_BID_PAY_TIMEOUT : OrderInfo.SELLER_PAY_TIMEOUT;
65 } 76 }
66 77
67 if(isWaitingPay){ 78 if(isWaitingPay){
  1 +package com.yohoufo.order.service.impl;
  2 +
  3 +import com.yohobuy.ufo.model.order.req.SellerOrderSubmitReq;
  4 +import com.yohoufo.order.BaseWebTest;
  5 +import org.junit.Test;
  6 +import org.springframework.beans.factory.annotation.Autowired;
  7 +
  8 +public class SellerOrderServiceTest extends BaseWebTest {
  9 +
  10 + @Autowired
  11 + private SellerOrderService sellerOrderService;
  12 +
  13 + @Test
  14 + public void test(){
  15 + int uid = 500031424;
  16 + int storage_id = 10091252;
  17 + String price = "59";
  18 + int num = 1;
  19 + String address_id = "2FUbfklOlk7tZuIPNc4TDA==";
  20 + int skupType = 1;
  21 + String businessClient = null;
  22 + SellerOrderSubmitReq req = SellerOrderSubmitReq.builder()
  23 + .uid(uid)
  24 + .storageId(storage_id)
  25 + .price(price)
  26 + .addressId(address_id)
  27 + .num(num)
  28 + .skupType(skupType)
  29 + .businessClient(businessClient)
  30 + .build();
  31 + sellerOrderService.publishPrd(req);
  32 + }
  33 +}
@@ -37,7 +37,7 @@ hystrix.threadpool.default.maxQueueSize=50000 @@ -37,7 +37,7 @@ hystrix.threadpool.default.maxQueueSize=50000
37 hystrix.threadpool.default.queueSizeRejectionThreshold=45000 37 hystrix.threadpool.default.queueSizeRejectionThreshold=45000
38 38
39 #zookeeper address 39 #zookeeper address
40 -zkAddress=192.168.102.45:2181 40 +zkAddress=192.168.104.201:2181
41 #zkAddress=192.168.102.45:2181 41 #zkAddress=192.168.102.45:2181
42 # web context 42 # web context
43 web.context=ufo-gateway 43 web.context=ufo-gateway
@@ -49,7 +49,7 @@ password.aes.key=yoho9646yoho9646 @@ -49,7 +49,7 @@ password.aes.key=yoho9646yoho9646
49 #用户uic服务地址 49 #用户uic服务地址
50 uic.service.url=http://java-yoho-uic.test3.ingress.dev.yohocorp.com/uic 50 uic.service.url=http://java-yoho-uic.test3.ingress.dev.yohocorp.com/uic
51 #消息盒子-baseurl 51 #消息盒子-baseurl
52 -inbox.baseurl=http://java-yohoufo-fore.test3.ingress.dev.yohocorp.com/ufo-gateway/?debug=XYZ 52 +inbox.baseurl=http://172.16.12.59:8080/ufo-gateway/?debug=XYZ
53 #signature encrypt key salt 53 #signature encrypt key salt
54 gateway.signature.key.salt=mQyMTMwZjlmZTZmYjY4UjkNmYwZGM0OTk0Y 54 gateway.signature.key.salt=mQyMTMwZjlmZTZmYjY4UjkNmYwZGM0OTk0Y
55 trace.enabled=false 55 trace.enabled=false
@@ -71,13 +71,16 @@ yoho.recovery.zkPath=/yh/config/recovery @@ -71,13 +71,16 @@ yoho.recovery.zkPath=/yh/config/recovery
71 71
72 72
73 wechat.app.partnerid=1218934901 73 wechat.app.partnerid=1218934901
74 -wechat.app.partnerkey=b22de5cfd0ded341e0516505f72649a9  
75 wechat.app.appid=wx049fdaa3ba9cdd7a 74 wechat.app.appid=wx049fdaa3ba9cdd7a
76 75
77 wechat.notifyurl=http://testapi.yohops.com/payment/weixin_notify 76 wechat.notifyurl=http://testapi.yohops.com/payment/weixin_notify
78 77
79 alipay.notifyurl=http://testapi.yohops.com/payment/alipay_notify 78 alipay.notifyurl=http://testapi.yohops.com/payment/alipay_notify
80 79
  80 +alipay.cross.border.notifyurl=http://testapi.yohops.com/payment/alipay_notify
  81 +
  82 +alipay.transfer.notifyurl=http://testapi.yohops.com/payment/alipay_transfer_notify
  83 +
81 erp-gateway.url=http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/erp-gateway 84 erp-gateway.url=http://java-yoho-erp-gateway.test3.ingress.dev.yohocorp.com/erp-gateway
82 85
83 redis.readonly.proxy.address=192.168.102.45 86 redis.readonly.proxy.address=192.168.102.45
@@ -104,29 +107,36 @@ order.buyer.cancelWhenSellerUnDelivery.money=38 @@ -104,29 +107,36 @@ order.buyer.cancelWhenSellerUnDelivery.money=38
104 order.buyer.cancelWhenSellerDelivery.sellerGetMoneyRate=0.8 107 order.buyer.cancelWhenSellerDelivery.sellerGetMoneyRate=0.8
105 order.buyer.cancelWhenSellerUnDelivery.sellerGetMoneyRate=0.8 108 order.buyer.cancelWhenSellerUnDelivery.sellerGetMoneyRate=0.8
106 109
  110 +order.seller.tip.publishMoneyTip=\u4FDD\u8BC1\u91D1\u4F59\u989D\u4E0D\u8DB3
  111 +order.seller.tip.publishFunctionTip=\u8BF7\u5145\u503C\u540E\u8FDB\u884C\u6B63\u5E38\u4E0A\u67B6/\u4E0B\u67B6
  112 +order.seller.tip.canSaleMoneyTip=\u4FDD\u8BC1\u91D1\u4F59\u989D\u4F4E\u4E8E
  113 +order.seller.tip.canSaleFunctionTip=\u5E73\u53F0\u4E0B\u67B6\u60A8\u6240\u6709\u51FA\u552E\u4E2D\u7684\u5546\u54C1
  114 +order.seller.tip.recoverTip=\u5145\u503C \uFFE5{} \u6062\u590D\u8D85\u7EA7\u5546\u5BB6\u6743\u9650
  115 +
107 116
108 117
109 uic.url=http://java-yoho-uic.test3.ingress.dev.yohocorp.com/uic 118 uic.url=http://java-yoho-uic.test3.ingress.dev.yohocorp.com/uic
110 yoho.message.controller.url=http://message-controller.yohoops.org/yoho-message-controller 119 yoho.message.controller.url=http://message-controller.yohoops.org/yoho-message-controller
  120 +yoho.reviewed.controller.url=http://java-yoho-reviewed.test3.ingress.dev.yohocorp.com/reviewed
111 121
112 #rabbit address for transaction compensate 122 #rabbit address for transaction compensate
  123 +#rabbit_host=192.168.104.199:30005
113 rabbit_host=192.168.102.45:5672 124 rabbit_host=192.168.102.45:5672
114 rabbit_user=yoho 125 rabbit_user=yoho
115 rabbit_password=yoho 126 rabbit_password=yoho
116 127
117 -  
118 -yoho.gateway.url=http://api-test3.dev.yohocorp.com  
119 -  
120 -  
121 #二次发货提醒 24*60 minutes 128 #二次发货提醒 24*60 minutes
122 mq.seller.deliverNotice.second=1440 129 mq.seller.deliverNotice.second=1440
123 #发货失败提醒 36*60 minutes 130 #发货失败提醒 36*60 minutes
124 -mq.seller.deliverNotice.third=2160 131 +mq.seller.deliverNotice.third=15
125 132
126 #old 二次发货提醒 108*60 minutes 133 #old 二次发货提醒 108*60 minutes
127 mq.seller.deliverNotice.old.second=6480 134 mq.seller.deliverNotice.old.second=6480
128 #old发货失败提醒 120*60 135 #old发货失败提醒 120*60
129 mq.seller.deliverNotice.old.third=7200 136 mq.seller.deliverNotice.old.third=7200
  137 +
  138 +yoho.gateway.url=http://api-test3.dev.yohocorp.com
  139 +
130 ufo.platform.url=http://java-ufo-platform.test3.ingress.dev.yohocorp.com/ufoPlatform 140 ufo.platform.url=http://java-ufo-platform.test3.ingress.dev.yohocorp.com/ufoPlatform
131 141
132 offline.store.seller=70,50000638 142 offline.store.seller=70,50000638
@@ -136,8 +146,12 @@ ip.port.uic.server = java-yoho-uic.test3.ingress.dev.yohocorp.com @@ -136,8 +146,12 @@ ip.port.uic.server = java-yoho-uic.test3.ingress.dev.yohocorp.com
136 ufo.nfc.syncBlockChain.url=http://192.168.102.49:3030/api/addItem 146 ufo.nfc.syncBlockChain.url=http://192.168.102.49:3030/api/addItem
137 147
138 ufo.invite.productSortLimit=16,20,40 148 ufo.invite.productSortLimit=16,20,40
139 -alipay.transfer.notifyurl=http://testapi.yohops.com/payment/alipay_transfer_notify 149 +
  150 +ufo.product.addSizeSortId=40
  151 +
  152 +#用户实名认证的次数
  153 +ufo.certification.timesLimit=3
140 154
141 # Unionpay 155 # Unionpay
142 unionpay.env=00 156 unionpay.env=00
143 -unionpay.notifyurl=http://testapi.yohops.com/payment/ufo_unionpay_notify  
  157 +unionpay.notifyurl=http://testapi.yohops.com/payment/ufo_unionpay_notify
1 datasources: 1 datasources:
2 - ufo_passport:  
3 - servers:  
4 - - 192.168.102.219:3306  
5 - - 192.168.102.219:3306  
6 - username: yh_test  
7 - password: 9nm0icOwt6bMHjMusIfMLw==  
8 - daos:  
9 - - com.yohoufo.dal.user.IUserAuthorizeHistoryDao  
10 - - com.yohoufo.dal.user.IUserAuthorizeInfoDao  
11 - - com.yohoufo.dal.user.IZhiMaCertDao  
12 - - com.yohoufo.dal.user.UsersNoticeMapper 2 + ufo_passport:
  3 + servers:
  4 + - 192.168.102.219:3306
  5 + - 192.168.102.219:3306
  6 + username: yh_test
  7 + password: 9nm0icOwt6bMHjMusIfMLw==
  8 + daos:
  9 + - com.yohoufo.dal.user.IUserAuthorizeHistoryDao
  10 + - com.yohoufo.dal.user.IUserAuthorizeInfoDao
  11 + - com.yohoufo.dal.user.IZhiMaCertDao
  12 + - com.yohoufo.dal.user.UsersNoticeMapper
13 13
14 - ufo_product:  
15 - servers:  
16 - - 192.168.102.219:3306  
17 - - 192.168.102.219:3306  
18 - username: yh_test  
19 - password: 9nm0icOwt6bMHjMusIfMLw==  
20 - daos:  
21 - - com.yohoufo.dal.product.StoragePriceMapper  
22 - - com.yohoufo.dal.product.StorageMapper  
23 - - com.yohoufo.dal.product.ProductMapper  
24 - - com.yohoufo.dal.product.GoodsMapper  
25 - - com.yohoufo.dal.product.GoodsImagesMapper  
26 - - com.yohoufo.dal.product.SizeMapper  
27 - - com.yohoufo.dal.product.BrandMapper  
28 - - com.yohoufo.dal.product.BrandSeriesMapper  
29 - - com.yohoufo.dal.product.ProductSortMapper  
30 - - com.yohoufo.dal.product.SearchWordMapper  
31 - - com.yohoufo.dal.product.SaleCategoryMapper  
32 - - com.yohoufo.dal.product.IdentifyRecordsMapper  
33 - - com.yohoufo.dal.product.IdentifyRelationMapper  
34 - - com.yohoufo.dal.product.ProductChainMapper  
35 - - com.yohoufo.dal.product.PriceTrendSixtyDayMapper  
36 - - com.yohoufo.dal.product.PriceTrendMonthMapper  
37 - - com.yohoufo.dal.product.PriceTrendHalfYearMapper  
38 - - com.yohoufo.dal.product.PriceTrendDayMapper  
39 - - com.yohoufo.dal.product.ProductImportTranItemMapper  
40 - - com.yohoufo.dal.product.TransferRecordsMapper  
41 - - com.yohoufo.dal.product.TransferRecordsHistoryMapper  
42 - - com.yohoufo.dal.product.ProductSalesMapper  
43 - - com.yohoufo.dal.product.ProductLimitSaleMapper  
44 - - com.yohoufo.dal.product.ProductSelfShelvesMapper  
45 - - com.yohoufo.dal.product.ProductSelfShelvesPicMapper  
46 - - com.yohoufo.dal.product.SecondhandFlawMapper  
47 - - com.yohoufo.dal.product.SecondhandImagesMapper  
48 - - com.yohoufo.dal.product.SecondhandInfoMapper  
49 - - com.yohoufo.dal.product.SelfSizeMapper  
50 - - com.yohoufo.dal.product.SelfSizeUidMapper  
51 - - com.yohoufo.dal.product.ProductProfitMapper  
52 - - com.yohoufo.dal.product.ProductPoolDetailMapper  
53 - - com.yohoufo.dal.product.BidStoragePriceMapper 14 + ufo_product:
  15 + servers:
  16 + - 192.168.102.219:3306
  17 + - 192.168.102.219:3306
  18 + username: yh_test
  19 + password: 9nm0icOwt6bMHjMusIfMLw==
  20 + daos:
  21 + - com.yohoufo.dal.product.StoragePriceMapper
  22 + - com.yohoufo.dal.product.StorageMapper
  23 + - com.yohoufo.dal.product.ProductMapper
  24 + - com.yohoufo.dal.product.GoodsMapper
  25 + - com.yohoufo.dal.product.GoodsImagesMapper
  26 + - com.yohoufo.dal.product.SizeMapper
  27 + - com.yohoufo.dal.product.BrandMapper
  28 + - com.yohoufo.dal.product.BrandSeriesMapper
  29 + - com.yohoufo.dal.product.ProductSortMapper
  30 + - com.yohoufo.dal.product.SearchWordMapper
  31 + - com.yohoufo.dal.product.SaleCategoryMapper
  32 + - com.yohoufo.dal.product.IdentifyRecordsMapper
  33 + - com.yohoufo.dal.product.IdentifyRelationMapper
  34 + - com.yohoufo.dal.product.ProductChainMapper
  35 + - com.yohoufo.dal.product.PriceTrendSixtyDayMapper
  36 + - com.yohoufo.dal.product.PriceTrendMonthMapper
  37 + - com.yohoufo.dal.product.PriceTrendHalfYearMapper
  38 + - com.yohoufo.dal.product.PriceTrendDayMapper
  39 + - com.yohoufo.dal.product.ProductImportTranItemMapper
  40 + - com.yohoufo.dal.product.TransferRecordsMapper
  41 + - com.yohoufo.dal.product.TransferRecordsHistoryMapper
  42 + - com.yohoufo.dal.product.ProductSalesMapper
  43 + - com.yohoufo.dal.product.ProductLimitSaleMapper
  44 + - com.yohoufo.dal.product.ProductSelfShelvesMapper
  45 + - com.yohoufo.dal.product.ProductSelfShelvesPicMapper
  46 + - com.yohoufo.dal.product.SecondhandFlawMapper
  47 + - com.yohoufo.dal.product.SecondhandImagesMapper
  48 + - com.yohoufo.dal.product.SecondhandInfoMapper
  49 + - com.yohoufo.dal.product.SelfSizeMapper
  50 + - com.yohoufo.dal.product.SelfSizeUidMapper
  51 + - com.yohoufo.dal.product.ProductProfitMapper
  52 + - com.yohoufo.dal.product.ProductPoolDetailMapper
  53 + - com.yohoufo.dal.product.BidStoragePriceMapper
54 54
55 55
56 - ufo_order:  
57 - servers:  
58 - - 192.168.102.219:3306  
59 - - 192.168.102.219:3306  
60 - username: yh_test  
61 - password: 9nm0icOwt6bMHjMusIfMLw==  
62 - daos:  
63 - - com.yohoufo.dal.order.BuyerOrderGoodsMapper  
64 - - com.yohoufo.dal.order.BuyerOrderMapper  
65 - - com.yohoufo.dal.order.BuyerOrderMetaMapper  
66 - - com.yohoufo.dal.order.ExpressRecordMapper  
67 - - com.yohoufo.dal.order.ExpressInfoMapper  
68 - - com.yohoufo.dal.order.SellerOrderGoodsMapper  
69 - - com.yohoufo.dal.order.SellerOrderMapper  
70 - - com.yohoufo.dal.order.SellerOrderMetaMapper  
71 - - com.yohoufo.dal.order.OrdersPayMapper  
72 - - com.yohoufo.dal.order.OrdersPayRefundMapper  
73 - - com.yohoufo.dal.order.ExpressCompanyMapper  
74 - - com.yohoufo.dal.order.AppraiseAddressMapper  
75 - - com.yohoufo.dal.order.TradeBillsMapper  
76 - - com.yohoufo.dal.order.OrdersPayTransferMapper  
77 - - com.yohoufo.dal.order.ManualTransferMapper  
78 - - com.yohoufo.dal.order.MachineIdGenerateMapper  
79 - - com.yohoufo.dal.order.SkupBatchMapper  
80 - - com.yohoufo.dal.order.SellerWalletMapper  
81 - - com.yohoufo.dal.order.SellerWalletDetailMapper  
82 - - com.yohoufo.dal.order.OrderCouponMapper  
83 - - com.yohoufo.dal.order.EntrySellerRechargeOrderMapper  
84 - - com.yohoufo.dal.order.StoredSellerMapper  
85 - - com.yohoufo.dal.order.SuperEntrySellerMapper  
86 - - com.yohoufo.dal.order.QiniuLiveRecordMapper  
87 - - com.yohoufo.dal.order.SellerOrderGoodsViewMapper  
88 - - com.yohoufo.dal.order.SellerTaskMapper  
89 - - com.yohoufo.dal.order.SellerTaskDetailMapper  
90 - - com.yohoufo.dal.order.OrdersPrePayMapper  
91 - - com.yohoufo.dal.order.MetaConfigMapper  
92 - - com.yohoufo.dal.order.BuyerOrderStatusFlowMapper  
93 - - com.yohoufo.dal.order.OrderOperateRecordMapper  
94 - - com.yohoufo.dal.order.QualityCheckMapper  
95 - - com.yohoufo.dal.order.BusinessLicenseMapper  
96 - - com.yohoufo.dal.order.SellerEnterApplyMapper  
97 - - com.yohoufo.dal.order.SellerFuncMapper  
98 - - com.yohoufo.dal.order.SellerLevelFuncMapper  
99 - - com.yohoufo.dal.order.OrderOverTimeMapper  
100 - - com.yohoufo.dal.order.BuyerOrderViewMapper  
101 - - com.yohoufo.dal.order.SellerJoinHistoryMapper  
102 - - com.yohoufo.dal.order.SellerChangePriceRecordMapper  
103 - - com.yohoufo.dal.order.InviteActivityMapper  
104 - - com.yohoufo.dal.order.InviteRecordMapper  
105 - - com.yohoufo.dal.order.InviterMapper  
106 - - com.yohoufo.dal.order.InviteSettlementItemMapper  
107 - - com.yohoufo.dal.order.InviteSettlementMapper  
108 - - com.yohoufo.dal.order.InviteCodeSequenceMapper  
109 - - com.yohoufo.dal.order.InviteCodeSequenceRandomMapper  
110 - - com.yohoufo.dal.order.SellerGoodsStatusFlowMapper  
111 - - com.yohoufo.dal.order.CmsPayMapper  
112 - - com.yohoufo.dal.order.OrdersPayHbfqMapper  
113 - - com.yohoufo.dal.order.BlackUserMapper  
114 - - com.yohoufo.dal.order.StorageDepositMapper  
115 - - com.yohoufo.dal.order.DepositOrderMapper  
116 - - com.yohoufo.dal.order.SellerOrderStatsConfigMapper  
117 - - com.yohoufo.dal.order.SellerOrderStatsResultMapper  
118 - - com.yohoufo.dal.order.AlipayBlackUserMapper  
119 - - com.yohoufo.dal.order.AppraiseOrderMapper  
120 - - com.yohoufo.dal.order.AppraiseOrderGoodsMapper  
121 - - com.yohoufo.dal.order.AppraiseOrderMetaMapper  
122 - - com.yohoufo.dal.order.AppraiseOrderStorageMapper  
123 - - com.yohoufo.dal.order.DepositCodeMapper  
124 - - com.yohoufo.dal.order.SellerServiceFeeRuleMapper  
125 - - com.yohoufo.dal.order.BuyerOrderPromotionMapper  
126 - - com.yohoufo.dal.order.BuyerChangePriceRecordMapper 56 + ufo_order:
  57 + servers:
  58 + - 192.168.102.219:3306
  59 + - 192.168.102.219:3306
  60 + username: yh_test
  61 + password: 9nm0icOwt6bMHjMusIfMLw==
  62 + daos:
  63 + - com.yohoufo.dal.order.BuyerOrderGoodsMapper
  64 + - com.yohoufo.dal.order.BuyerOrderMapper
  65 + - com.yohoufo.dal.order.BuyerOrderMetaMapper
  66 + - com.yohoufo.dal.order.ExpressRecordMapper
  67 + - com.yohoufo.dal.order.ExpressInfoMapper
  68 + - com.yohoufo.dal.order.SellerOrderGoodsMapper
  69 + - com.yohoufo.dal.order.SellerOrderMapper
  70 + - com.yohoufo.dal.order.SellerOrderMetaMapper
  71 + - com.yohoufo.dal.order.OrdersPayMapper
  72 + - com.yohoufo.dal.order.OrdersPayRefundMapper
  73 + - com.yohoufo.dal.order.ExpressCompanyMapper
  74 + - com.yohoufo.dal.order.AppraiseAddressMapper
  75 + - com.yohoufo.dal.order.TradeBillsMapper
  76 + - com.yohoufo.dal.order.OrdersPayTransferMapper
  77 + - com.yohoufo.dal.order.ManualTransferMapper
  78 + - com.yohoufo.dal.order.MachineIdGenerateMapper
  79 + - com.yohoufo.dal.order.SkupBatchMapper
  80 + - com.yohoufo.dal.order.SellerWalletMapper
  81 + - com.yohoufo.dal.order.SellerWalletDetailMapper
  82 + - com.yohoufo.dal.order.OrderCouponMapper
  83 + - com.yohoufo.dal.order.EntrySellerRechargeOrderMapper
  84 + - com.yohoufo.dal.order.StoredSellerMapper
  85 + - com.yohoufo.dal.order.SuperEntrySellerMapper
  86 + - com.yohoufo.dal.order.QiniuLiveRecordMapper
  87 + - com.yohoufo.dal.order.SellerOrderGoodsViewMapper
  88 + - com.yohoufo.dal.order.SellerTaskMapper
  89 + - com.yohoufo.dal.order.SellerTaskDetailMapper
  90 + - com.yohoufo.dal.order.OrdersPrePayMapper
  91 + - com.yohoufo.dal.order.MetaConfigMapper
  92 + - com.yohoufo.dal.order.BuyerOrderStatusFlowMapper
  93 + - com.yohoufo.dal.order.OrderOperateRecordMapper
  94 + - com.yohoufo.dal.order.QualityCheckMapper
  95 + - com.yohoufo.dal.order.BusinessLicenseMapper
  96 + - com.yohoufo.dal.order.SellerEnterApplyMapper
  97 + - com.yohoufo.dal.order.SellerFuncMapper
  98 + - com.yohoufo.dal.order.SellerLevelFuncMapper
  99 + - com.yohoufo.dal.order.OrderOverTimeMapper
  100 + - com.yohoufo.dal.order.BuyerOrderViewMapper
  101 + - com.yohoufo.dal.order.SellerJoinHistoryMapper
  102 + - com.yohoufo.dal.order.SellerChangePriceRecordMapper
  103 + - com.yohoufo.dal.order.InviteActivityMapper
  104 + - com.yohoufo.dal.order.InviteRecordMapper
  105 + - com.yohoufo.dal.order.InviterMapper
  106 + - com.yohoufo.dal.order.InviteSettlementItemMapper
  107 + - com.yohoufo.dal.order.InviteSettlementMapper
  108 + - com.yohoufo.dal.order.InviteCodeSequenceMapper
  109 + - com.yohoufo.dal.order.InviteCodeSequenceRandomMapper
  110 + - com.yohoufo.dal.order.SellerGoodsStatusFlowMapper
  111 + - com.yohoufo.dal.order.CmsPayMapper
  112 + - com.yohoufo.dal.order.OrdersPayHbfqMapper
  113 + - com.yohoufo.dal.order.BlackUserMapper
  114 + - com.yohoufo.dal.order.StorageDepositMapper
  115 + - com.yohoufo.dal.order.DepositOrderMapper
  116 + - com.yohoufo.dal.order.SellerOrderStatsConfigMapper
  117 + - com.yohoufo.dal.order.SellerOrderStatsResultMapper
  118 + - com.yohoufo.dal.order.AlipayBlackUserMapper
  119 + - com.yohoufo.dal.order.AppraiseOrderMapper
  120 + - com.yohoufo.dal.order.AppraiseOrderGoodsMapper
  121 + - com.yohoufo.dal.order.AppraiseOrderMetaMapper
  122 + - com.yohoufo.dal.order.AppraiseOrderStorageMapper
  123 + - com.yohoufo.dal.order.DepositCodeMapper
  124 + - com.yohoufo.dal.order.SellerServiceFeeRuleMapper
  125 + - com.yohoufo.dal.order.BuyerOrderPromotionMapper
  126 + - com.yohoufo.dal.order.BuyerChangePriceRecordMapper
127 127
128 - ufo_promotion:  
129 - servers:  
130 - - 192.168.102.219:3306  
131 - - 192.168.102.219:3306  
132 - username: yh_test  
133 - password: 9nm0icOwt6bMHjMusIfMLw==  
134 - daos:  
135 - - com.yohoufo.dal.promotion.CouponMapper  
136 - - com.yohoufo.dal.promotion.CouponProductLimitMapper  
137 - - com.yohoufo.dal.promotion.CouponTypeMapper  
138 - - com.yohoufo.dal.promotion.UserCouponMapper  
139 - - com.yohoufo.dal.promotion.IActivityMapper  
140 - - com.yohoufo.dal.promotion.IActivityProductScopeMapper  
141 - - com.yohoufo.dal.promotion.IActivityAmountConditionMapper 128 + ufo_promotion:
  129 + servers:
  130 + - 192.168.102.219:3306
  131 + - 192.168.102.219:3306
  132 + username: yh_test
  133 + password: 9nm0icOwt6bMHjMusIfMLw==
  134 + daos:
  135 + - com.yohoufo.dal.promotion.CouponMapper
  136 + - com.yohoufo.dal.promotion.CouponProductLimitMapper
  137 + - com.yohoufo.dal.promotion.CouponTypeMapper
  138 + - com.yohoufo.dal.promotion.UserCouponMapper
  139 + - com.yohoufo.dal.promotion.IActivityMapper
  140 + - com.yohoufo.dal.promotion.IActivityProductScopeMapper
  141 + - com.yohoufo.dal.promotion.IActivityAmountConditionMapper
142 142
143 - ufo_resource:  
144 - servers:  
145 - - 192.168.102.219:3306  
146 - - 192.168.102.219:3306  
147 - username: yh_test  
148 - password: 9nm0icOwt6bMHjMusIfMLw==  
149 - daos:  
150 - - com.yohoufo.dal.resource.ResourcesContentDataMapper  
151 - - com.yohoufo.dal.resource.ResourcesContentMapper  
152 - - com.yohoufo.dal.resource.ResourcesMapper  
153 - - com.yohoufo.dal.resource.ConfigTypeMapper  
154 - - com.yohoufo.dal.resource.ResourcesGoodsPoolMapper 143 + ufo_resource:
  144 + servers:
  145 + - 192.168.102.219:3306
  146 + - 192.168.102.219:3306
  147 + username: yh_test
  148 + password: 9nm0icOwt6bMHjMusIfMLw==
  149 + daos:
  150 + - com.yohoufo.dal.resource.ResourcesContentDataMapper
  151 + - com.yohoufo.dal.resource.ResourcesContentMapper
  152 + - com.yohoufo.dal.resource.ResourcesMapper
  153 + - com.yohoufo.dal.resource.ConfigTypeMapper
  154 + - com.yohoufo.dal.resource.ResourcesGoodsPoolMapper
155 155
156 - line_shops:  
157 - servers:  
158 - - 192.168.102.219:3306  
159 - - 192.168.102.219:3306  
160 - username: yh_test  
161 - password: 9nm0icOwt6bMHjMusIfMLw==  
162 - daos:  
163 - - com.yohoufo.dal.product.IStoreInfoDAO  
164 - - com.yohoufo.dal.product.IStoreInfoExtendDAO 156 + line_shops:
  157 + servers:
  158 + - 192.168.102.219:3306
  159 + - 192.168.102.219:3306
  160 + username: yh_test
  161 + password: 9nm0icOwt6bMHjMusIfMLw==
  162 + daos:
  163 + - com.yohoufo.dal.product.IStoreInfoDAO
  164 + - com.yohoufo.dal.product.IStoreInfoExtendDAO
165 165
166 readOnlyInSlave: true 166 readOnlyInSlave: true
@@ -4,16 +4,57 @@ ufo.product.defaultAuthHeadIcon=http://head.static.yhbimg.com/yhb-head/2018/12/2 @@ -4,16 +4,57 @@ ufo.product.defaultAuthHeadIcon=http://head.static.yhbimg.com/yhb-head/2018/12/2
4 ufo.product.defaultUserHeadIcon=http://head.static.yhbimg.com/yhb-head/2018/12/28/14/0160773bb87685aade796ea4f94e0587cf.png?imageView2/{mode}/w/{width}/h/{height} 4 ufo.product.defaultUserHeadIcon=http://head.static.yhbimg.com/yhb-head/2018/12/28/14/0160773bb87685aade796ea4f94e0587cf.png?imageView2/{mode}/w/{width}/h/{height}
5 5
6 #UFO propaganda video info 6 #UFO propaganda video info
7 -ufo.order.initVideo = http://flv01.static.yhbimg.com/ufo/live/mp4/9827059662848_1545892263.mp4  
8 -ufo.order.initVideoPic = http://img11.static.yhbimg.com/goodsimg/2018/12/28/17/01d30dbfc038ffffc2fc9506dcf9da164f.jpg 7 +ufo.order.initVideo = http://flv01.static.yhbimg.com/ufo/live/mp4/9841097408512_1547704777.mp4
  8 +ufo.order.initVideoPic = http://img11.static.yhbimg.com/goodsimg/2019/01/15/17/01def37377a13f53f359b9b6d8fe7eee8e.png
9 ufo.order.initVideoDesc = \u5ba3\u4f20\u89c6\u9891 9 ufo.order.initVideoDesc = \u5ba3\u4f20\u89c6\u9891
10 ufo.order.initVideoTime = 1546272000 10 ufo.order.initVideoTime = 1546272000
11 ufo.order.realDesc = \u9274\u5b9a\u7ed3\u679c\uff1a\u771f 11 ufo.order.realDesc = \u9274\u5b9a\u7ed3\u679c\uff1a\u771f
12 - 12 +ufo.order.realVideoPic = http://img11.static.yhbimg.com/goodsimg/2019/01/25/15/01f6c0a2303cfa1957a34b9f8b17e7e746.png
  13 +ufo.order.initVideoShow = false
  14 +ufo.order.appressVideoShow = true
13 15
14 #二次发货提醒 108*60 minutes 16 #二次发货提醒 108*60 minutes
15 ufo.order.sellerDeliverNoticeSecond = 6480 17 ufo.order.sellerDeliverNoticeSecond = 6480
16 #发货失败提醒 120*60 minutes 18 #发货失败提醒 120*60 minutes
17 ufo.order.sellerDeliverNoticeThird = 7200 19 ufo.order.sellerDeliverNoticeThird = 7200
18 #新的发货上线时间 20190129 18:00:00 20 #新的发货上线时间 20190129 18:00:00
19 -ufo.order.sellerDeliverNewOnlineTime = 1548756000  
  21 +ufo.order.sellerDeliverNewOnlineTime = 1548756000
  22 +
  23 +ufo.order.sellerDeliverNewOnlineTimeEx = 1550127600
  24 +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
  25 +ufo.seller.rejoinMaxTimes=1
  26 +ufo.invite.isSupportBeenInvited=true
  27 +
  28 +ufo.order.certPhotoSwitchCacheKey=true
  29 +ufo.user.photoCheckLimit=3
  30 +
  31 +#可以自助上架尺码的一级品类配置
  32 +ufo.product.addSizeSortId=40
  33 +
  34 +
  35 +ufo.order.buyer.allow_buy_self_sell_goods=true
  36 +
  37 +ufo.order.seller.hkAccountSettlementAmountLimit=100
  38 +ufo.order.seller.hkAccountSettlementEmailTo=xiuchun.luo@yoho.cn
  39 +ufo.order.seller.noticeHKSellerEmailTo=chao.chen@yoho.cn,xiuchun.luo@yoho.cn
  40 +
  41 +#实名认证开关
  42 +ufo.user.idCertSwitch=false
  43 +
  44 +#实名认证提示版本升级开关
  45 +ufo.user.idCertUpdateVersionSwitch = true
  46 +
  47 +
  48 +#time out
  49 +hystrix.command.wallet.assetWithdrawForPlat.execution.isolation.thread.timeoutInMilliseconds=3000
  50 +
  51 +ufo.order.pay.transferWithWalletSwitch=false
  52 +
  53 +# 寄存转现货开关
  54 +ufo.deposit2Instock.close = true
  55 +
  56 +#验签开关
  57 +gateway.signature.isVerifyAllMethod = true
  58 +
  59 +#闲鱼品类
  60 +ufo.product.xianYuSorts = 40
@@ -8,18 +8,37 @@ @@ -8,18 +8,37 @@
8 <pattern>[%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}] - %-5level [%thread] %logger{35} - %m%n</pattern> 8 <pattern>[%X{X-B3-TraceId:-},%X{X-B3-SpanId:-},%X{X-Span-Export:-}] - %-5level [%thread] %logger{35} - %m%n</pattern>
9 </encoder> 9 </encoder>
10 </appender> 10 </appender>
  11 + <appender name="DEBUG_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
  12 +
  13 + <file>/Data/logs/ufo-gateway/debug.log</file>
  14 + <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
  15 + <!-- daily rollover -->
  16 + <fileNamePattern>/Data/logs/ufo-gateway/archived/debug.%d{yyyy-MM-dd}.%i.log.gz
  17 + </fileNamePattern>
  18 + <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
  19 + <!-- or whenever the file size reaches 100MB -->
  20 + <maxFileSize>100MB</maxFileSize>
  21 + </timeBasedFileNamingAndTriggeringPolicy>
  22 + <!-- keep 30 days' worth of history -->
  23 + <maxHistory>30</maxHistory>
  24 + </rollingPolicy>
  25 +
  26 + <encoder>
  27 + <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>
  28 + </encoder>
  29 + </appender>
11 30
12 <!-- 登录时，如果一个IP在一定时间内登录次数过多，记录日志 appender --> 31 <!-- 登录时，如果一个IP在一定时间内登录次数过多，记录日志 appender -->
13 32
14 <appender name="WARN_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender"> 33 <appender name="WARN_LOG" class="ch.qos.logback.core.rolling.RollingFileAppender">
15 - <file>/Data/logs/ufo-gateway/debug.log</file> 34 + <file>/Data/logs/ufo-gateway/warn.log</file>
16 <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy"> 35 <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
17 <!-- daily rollover --> 36 <!-- daily rollover -->
18 <fileNamePattern>debug.%d{yyyy-MM-dd}.%i.log.gz 37 <fileNamePattern>debug.%d{yyyy-MM-dd}.%i.log.gz
19 </fileNamePattern> 38 </fileNamePattern>
20 <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP"> 39 <timeBasedFileNamingAndTriggeringPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
21 <!-- or whenever the file size reaches 100MB --> 40 <!-- or whenever the file size reaches 100MB -->
22 - <maxFileSize>10KB</maxFileSize> 41 + <maxFileSize>1000KB</maxFileSize>
23 </timeBasedFileNamingAndTriggeringPolicy> 42 </timeBasedFileNamingAndTriggeringPolicy>
24 <!-- keep 30 days' worth of history --> 43 <!-- keep 30 days' worth of history -->
25 <maxHistory>30</maxHistory> 44 <maxHistory>30</maxHistory>
1 redis: 1 redis:
2 gwNoSyncRedis : 2 gwNoSyncRedis :
3 servers: 3 servers:
4 - - 192.168.104.246:6379  
  4 + - 192.168.104.201:6379
@@ -54,6 +54,11 @@ consumer: @@ -54,6 +54,11 @@ consumer:
54 delay: 54 delay:
55 interval: 15 55 interval: 15
56 56
  57 + - class: com.yohoufo.order.mq.consumer.SellerOrderAutoCancelDelayMsgConsumer
  58 + topic: sellerOrder.autoCancel
  59 + delay:
  60 + interval: 2
  61 +
57 - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer 62 - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer
58 topic: buyerOrder.autoCancel 63 topic: buyerOrder.autoCancel
59 delay: 64 delay:
@@ -53,6 +53,11 @@ consumer: @@ -53,6 +53,11 @@ consumer:
53 delay: 53 delay:
54 interval: 15 54 interval: 15
55 55
  56 + - class: com.yohoufo.order.mq.consumer.SellerOrderAutoCancelDelayMsgConsumer
  57 + topic: sellerOrder.autoCancel
  58 + delay:
  59 + interval: 2
  60 +
56 - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer 61 - class: com.yohoufo.order.mq.consumer.BuyerOrderAutoCancelDelayMsgConsumer
57 topic: buyerOrder.autoCancel 62 topic: buyerOrder.autoCancel
58 delay: 63 delay: