ufo / yohoufo-fore · Commits

Go to a project

Authored by mali
Commit e7230be64a361c04e11d4504b3f15a92005eb436 2 parents 80b2c6b1 4f6d67e5

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

Inline Side-by-side
Showing 2 changed files with 11 additions and 10 deletions
@@ -100,13 +100,17 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<SkupDo @@ -100,13 +100,17 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<SkupDo
100 successOrders.add(skupDtoMap.get(skup).getSellerOrder()); 100 successOrders.add(skupDtoMap.get(skup).getSellerOrder());
101 } 101 }
102 try { 102 try {
103 - boolean isSuper = sellerService.isSuperEntrySeller(uid); 103 +
104 boolean isQuickDeliver = SellerGoodsHelper.isQuickDeliver(sdspDto.getSkupType()); 104 boolean isQuickDeliver = SellerGoodsHelper.isQuickDeliver(sdspDto.getSkupType());
105 if (!isQuickDeliver) { 105 if (!isQuickDeliver) {
  106 + boolean isSuper = sellerService.isSuperEntrySeller(uid);
106 //退保证金 107 //退保证金
107 SellerWallet sellerWallet = postRefundEarnest(uid, taskId, isSuper, result, successOrders); 108 SellerWallet sellerWallet = postRefundEarnest(uid, taskId, isSuper, result, successOrders);
108 //明细 109 //明细
109 addWalletDetail(uid, taskId, isSuper, sellerWallet, successOrders); 110 addWalletDetail(uid, taskId, isSuper, sellerWallet, successOrders);
  111 +
  112 + //消息盒子
  113 + inboxNotify(uid, skupDtoMap);
110 }else{ 114 }else{
111 try { 115 try {
112 depositService.changeSaleStatusOffBatch(uid, new ArrayList<>(result.successSkups)); 116 depositService.changeSaleStatusOffBatch(uid, new ArrayList<>(result.successSkups));
@@ -114,11 +118,7 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<SkupDo @@ -114,11 +118,7 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<SkupDo
114 log.warn("in batch off shelve 4 quick deliver prd fail , uid {} skups {}", 118 log.warn("in batch off shelve 4 quick deliver prd fail , uid {} skups {}",
115 uid, result.successSkups, ex); 119 uid, result.successSkups, ex);
116 } 120 }
117 -  
118 } 121 }
119 - //消息盒子  
120 - inboxNotify(uid, skupDtoMap);  
121 -  
122 //清理缓存 122 //清理缓存
123 cleanCache(uid, skupDtoMap); 123 cleanCache(uid, skupDtoMap);
124 } catch (Exception ex) { 124 } catch (Exception ex) {
@@ -485,8 +485,9 @@ public class SkupListService { @@ -485,8 +485,9 @@ public class SkupListService {
485 * @return 485 * @return
486 */ 486 */
487 public OrderListInfo getOrderListInfo(SellerGoodsRequest req){ 487 public OrderListInfo getOrderListInfo(SellerGoodsRequest req){
488 - SkupListType skupListType = SkupListType.ENTIRELY_NEW;  
489 - List<Integer> skupTypeCodes = skupListType.getSkupTypeCodes(true); 488 + SkupListType skupListType = req.getSkupListType();
  489 + boolean isEntryNecessary = SkupListType.QUICK_DELIVER.equals(skupListType) ? false : true;
  490 + List<Integer> skupTypeCodes = skupListType.getSkupTypeCodes(isEntryNecessary);
490 SkupStatus ss = SkupStatus.CAN_SELL; 491 SkupStatus ss = SkupStatus.CAN_SELL;
491 Integer status = ss.getCode(); 492 Integer status = ss.getCode();
492 Integer uid = req.getUid(); 493 Integer uid = req.getUid();
@@ -495,13 +496,13 @@ public class SkupListService { @@ -495,13 +496,13 @@ public class SkupListService {
495 sogCondition.setProductId(productId=req.getProductId()); 496 sogCondition.setProductId(productId=req.getProductId());
496 sogCondition.setUid(uid); 497 sogCondition.setUid(uid);
497 sogCondition.setStatus(status); 498 sogCondition.setStatus(status);
498 - boolean isEntry = true;  
499 - List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, skupTypeCodes , 0, 1, isEntry); 499 +
  500 + List<SellerOrderGoods> sogList = sellerOrderGoodsViewMapper.selectEntryListByUidStatusGBSku(sogCondition, skupTypeCodes , 0, 1, isEntryNecessary);
500 if (CollectionUtils.isEmpty(sogList)){ 501 if (CollectionUtils.isEmpty(sogList)){
501 logger.warn("in getOrderListInfo soglist is empty req {}", req); 502 logger.warn("in getOrderListInfo soglist is empty req {}", req);
502 return null; 503 return null;
503 } 504 }
504 - return buildEntryOrderListInfo(sogList.get(0), ss, skupTypeCodes, isEntry); 505 + return buildEntryOrderListInfo(sogList.get(0), ss, skupTypeCodes, isEntryNecessary);
505 } 506 }
506 507
507 OrderListInfo buildEntryOrderListInfo(SellerOrderGoods sellerOrderGoods, SkupStatus skupStatus, 508 OrderListInfo buildEntryOrderListInfo(SellerOrderGoods sellerOrderGoods, SkupStatus skupStatus,