Authored by wujiexiang

分账记录任务id

@@ -428,10 +428,10 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService { @@ -428,10 +428,10 @@ public class MerchantOrderPaymentService extends AbstractOrderPaymentService {
428 } 428 }
429 429
430 // 下架商品(卖家+系统):明细记录+退款表记录 430 // 下架商品(卖家+系统):明细记录+退款表记录
431 - public void unshelveAddWalletDetail(SellerWallet sw, List<OrderInfo> orderList) { 431 + public void unshelveAddWalletDetail(SellerWallet sw, MerchantOrderAttachInfo attachInfo,List<OrderInfo> orderList) {
432 SellerWalletDetail.Type type = SellerWalletDetail.Type.SELLER_OFF; 432 SellerWalletDetail.Type type = SellerWalletDetail.Type.SELLER_OFF;
433 for(OrderInfo oi : orderList) { 433 for(OrderInfo oi : orderList) {
434 - SellerWalletDetail swd = addWalletDetail(sw, null,oi.getOrderCode(), oi.getAmount(), type); 434 + SellerWalletDetail swd = addWalletDetail(sw, attachInfo, oi.getOrderCode(), oi.getAmount(), type);
435 addRefundRecord(swd, oi.getAmount()); 435 addRefundRecord(swd, oi.getAmount());
436 } 436 }
437 } 437 }
@@ -95,7 +95,6 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<Map<In @@ -95,7 +95,6 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<Map<In
95 SellerWallet sellerWallet = postRefundEarnest(uid, taskId, isSuper, result, successOrders); 95 SellerWallet sellerWallet = postRefundEarnest(uid, taskId, isSuper, result, successOrders);
96 //明细 96 //明细
97 addWalletDetail(uid, taskId, isSuper, sellerWallet, successOrders); 97 addWalletDetail(uid, taskId, isSuper, sellerWallet, successOrders);
98 -  
99 //消息盒子 98 //消息盒子
100 inboxNotify(uid, skupDtoMap); 99 inboxNotify(uid, skupDtoMap);
101 100
@@ -140,7 +139,8 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<Map<In @@ -140,7 +139,8 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<Map<In
140 List<OrderInfo> orderList = successOrders.parallelStream().map(so -> OrderInfo.builder() 139 List<OrderInfo> orderList = successOrders.parallelStream().map(so -> OrderInfo.builder()
141 .orderCode(so.getOrderCode()).amount(so.getEarnestMoney()).build()).collect(Collectors.toList()); 140 .orderCode(so.getOrderCode()).amount(so.getEarnestMoney()).build()).collect(Collectors.toList());
142 try { 141 try {
143 - merchantOrderPaymentService.unshelveAddWalletDetail(sellerWallet, orderList); 142 + MerchantOrderAttachInfo attachInfo = MerchantOrderAttachInfo.builder().seriNo(String.valueOf(taskId)).build();
  143 + merchantOrderPaymentService.unshelveAddWalletDetail(sellerWallet, attachInfo, orderList);
144 log.info("[{}-{}] end to add wallet detail success", uid, taskId); 144 log.info("[{}-{}] end to add wallet detail success", uid, taskId);
145 } catch (Exception ex) { 145 } catch (Exception ex) {
146 log.error("[{}-{}] exception happened when add wallet detail", uid, taskId, ex); 146 log.error("[{}-{}] exception happened when add wallet detail", uid, taskId, ex);
@@ -386,7 +386,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi @@ -386,7 +386,7 @@ public class SellerOrderService implements IOrderListService, IOrderDetailServi
386 if (!isSurper) { 386 if (!isSurper) {
387 List<OrderInfo> orderList = soList.parallelStream().map(so -> OrderInfo.builder() 387 List<OrderInfo> orderList = soList.parallelStream().map(so -> OrderInfo.builder()
388 .orderCode(so.getOrderCode()).amount(so.getEarnestMoney()).build()).collect(Collectors.toList()); 388 .orderCode(so.getOrderCode()).amount(so.getEarnestMoney()).build()).collect(Collectors.toList());
389 - merchantOrderPaymentService.unshelveAddWalletDetail(sellerWallet, orderList); 389 + merchantOrderPaymentService.unshelveAddWalletDetail(sellerWallet, null, orderList);
390 } 390 }
391 SkupDto skupDto = tskupMap.values().iterator().next(); 391 SkupDto skupDto = tskupMap.values().iterator().next();
392 SellerOrderGoods sellerOrderGoods = skupDto.getSellerOrderGoods(); 392 SellerOrderGoods sellerOrderGoods = skupDto.getSellerOrderGoods();