Merge remote-tracking branch 'origin/main' into main

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/controller/admin/order/vo/order/TradeOrderRespNewVO.java

@@ -44,6 +44,9 @@ public class TradeOrderRespNewVO {
     @Schema(description = "订单状态", example = "1")
     private Integer orderStatus;
 
+    @Schema(description = "支付状态", example = "1")
+    private Integer payStatus;
+
     @Schema(description = "销售来源", example = "31758")
     private String sourceId;
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/billrule/BillRuleServiceImpl.java

@@ -200,8 +200,14 @@ public class BillRuleServiceImpl implements BillRuleService {
         }else{
             if(loginUser.getStoreId()!=null) {
                 //需要改
-                StoreRespVO store = distributorMapper.selectStore(loginUser.getStoreId());
-                storeList.add(store);
+                try {
+                    StoreRespVO store = distributorMapper.selectStore(loginUser.getStoreId());
+                    if (store != null) {
+                        storeList.add(store);
+                    }
+                }catch (Exception e){
+                   return storeList;
+                }
             }else{
                 storeList = distributorMapper.selectDistributorStore(loginUser.getDistributorId());
             }

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -2369,6 +2369,9 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
             item.setCountryName(AreaUtils.format2Str(item.getCountryId()));
         });
         orderRespNewVO.setCountryList(countryList);
+        if(tradeOrderDO.getPayStatus()==0){
+            tradeOrderDO.setPayAmount(BigDecimal.ZERO);
+        }
         //设置订单汇总数据
         TradeOrderTotalDO tradeOrderTotalDO = tradeOrderTotalMapper.selectOne(TradeOrderTotalDO::getOrderId, id);
         TradeOrderTotalVO summary = BeanUtils.toBean(tradeOrderTotalDO, TradeOrderTotalVO.class);