merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -175,6 +175,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
     @Autowired
     private ISysTenantService sysTenantService;
 
+    @Autowired
+    private ISysOldOrgService sysOldOrgService;
+
     @Autowired
     private ITopOldSellerDiscountService topOldSellerDiscountService;
 
@@ -1403,6 +1406,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
 
 
     private void handleRefundOrder(List<TopOldOrderRefundVo> orderRefundList,String inputOrderSn,String tenantId){
+        SysOldOrg oldOrg = sysOldOrgService.getOne(new LambdaQueryWrapper<SysOldOrg>().eq(SysOldOrg::getOrgId, tenantId));
+        if (ObjectUtils.isNull(oldOrg)){
+            throw new CustomException("新系统订单机构信息获取失败！");
+        }
         orderRefundList.forEach(refund -> {
             TopOldOrderGoods item = topOrderGoodsService.getById(refund.getOrderGoodsId());
             User user = userService.getOne(new LambdaQueryWrapper<User>()
@@ -1424,7 +1431,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                         List<OrderGoodsVo> goodsVoList = collect.stream().map(x -> BeanUtil.toBean(x, OrderGoodsVo.class)).collect(Collectors.toList());
                         String respone = "";
                         HashMap<String, String> map = new HashMap<>();
-                        map.put("TenantId",tenantId);
+                        map.put("TenantId",oldOrg.getTenantId().toString());
                         String params = JSONArray.toJSONString(goodsVoList);
                         try {
                             respone = HttpUtils.sendPostJsonHeader(REFUND_PAY_HANDLE, params,map);
@@ -3160,6 +3167,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                     .eq(TopOldOrderRefund::getOrderSn, order.getOrderSn())
                     .eq(TopOldOrderRefund::getPeriodStatus, 4)
                     .eq(TopOldOrderRefund::getStatus, 1));
+            if (CollectionUtils.isEmpty(list)){
+                throw new CustomException("退款单不存在");
+            }
            switch (bo.getStatus()){
                case 0://支付失败
                    bankPay.setResultStatus(-1);