From 01beed1b10d21f2422ce2507c561f0a2dbbac27e Mon Sep 17 00:00:00 2001
From: cabbage <281119120@qq.com>
Date: Wed, 17 Sep 2025 11:36:39 +0800
Subject: [PATCH] =?UTF-8?q?##=20=E8=BF=81=E7=A7=BB=E8=A1=A5=E5=85=A8?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/SaDeliverUnhandledController.java     |  8 ++++++++
 .../common/domain/sale/wares/BdWaresExtend.java  |  6 +++---
 .../manage/OnlinePayConfigController.java        | 16 +++++++++++-----
 3 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java
index c37f3c18..06f40958 100644
--- a/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java
+++ b/bd-business/bd-business-sale/src/main/java/com/hzs/sale/deliver/controller/manage/SaDeliverUnhandledController.java
@@ -108,6 +108,10 @@ public class SaDeliverUnhandledController extends BaseController {
         param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
         param.setVertexIdList(userAuthorityDTO.getVertexIdList());
         param.setTeamList(userAuthorityDTO.getUserTeamList());
+        // 兼容调换货产品
+        if (CollectionUtil.isEmpty(param.getPkWaresList())) {
+            param.setPkWaresList(Collections.singletonList(0));
+        }
 
         startPage();
         List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
@@ -151,6 +155,10 @@ public class SaDeliverUnhandledController extends BaseController {
         param.setAreaScopeList(userAuthorityDTO.getRoleAreaScopeList());
         param.setVertexIdList(userAuthorityDTO.getVertexIdList());
         param.setTeamList(userAuthorityDTO.getUserTeamList());
+        // 兼容调换货产品
+        if (CollectionUtil.isEmpty(param.getPkWaresList())) {
+            param.setPkWaresList(Collections.singletonList(0));
+        }
 
         List<DeliverUnhandledVO> resultList = iSaOrderItemsService.queryDeliverUnhandledList(param, pkCountry);
 
diff --git a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java
index d0f0dcf6..bc14790d 100644
--- a/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java
+++ b/bd-common/bd-common-domain/src/main/java/com/hzs/common/domain/sale/wares/BdWaresExtend.java
@@ -86,13 +86,13 @@ public class BdWaresExtend extends BaseEntity {
     /**
      * 上架时间
      */
-    @TableField("PUT_ON_TIME")
+    @TableField(value = "PUT_ON_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
     private Date putOnTime;
 
     /**
      * 下架时间
      */
-    @TableField("PUT_OFF_TIME")
+    @TableField(value = "PUT_OFF_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
     private Date putOffTime;
 
     /**
@@ -134,7 +134,7 @@ public class BdWaresExtend extends BaseEntity {
     /**
      * （预计时间）到货时间
      */
-    @TableField("ARRIVAL_TIME")
+    @TableField(value = "ARRIVAL_TIME", jdbcType = JdbcType.DATE, updateStrategy = FieldStrategy.IGNORED)
     private Date arrivalTime;
 
     /**
diff --git a/bd-third/src/main/java/com/hzs/third/pay/controller/manage/OnlinePayConfigController.java b/bd-third/src/main/java/com/hzs/third/pay/controller/manage/OnlinePayConfigController.java
index 3c8b17d1..4bc4d420 100644
--- a/bd-third/src/main/java/com/hzs/third/pay/controller/manage/OnlinePayConfigController.java
+++ b/bd-third/src/main/java/com/hzs/third/pay/controller/manage/OnlinePayConfigController.java
@@ -14,11 +14,7 @@ import org.springframework.data.redis.core.RedisTemplate;
 import org.springframework.web.bind.annotation.*;
 
 /**
- * @Description: 在线支付配置
- * @Author: jiang chao
- * @Time: 2023/3/23 16:15
- * @Classname: OnlinePayConfigController
- * @PackageName: com.hzs.third.pay.controller.manage
+ * 在线支付配置
  */
 @RestController
 @RequestMapping("/manage/online-config")
@@ -40,6 +36,16 @@ public class OnlinePayConfigController {
         OnlinePayConfigVO payConfigVO = new OnlinePayConfigVO();
 
         // 各支付方式： true=显示，false=隐藏
+        // 京东收银台（H5）
+        String pay5 = String.format(PayConfigConstants.PAY_CONFIG_5, pkCountry);
+        if (redisTemplate.hasKey(pay5)) {
+            payConfigVO.setPay5((Boolean) redisTemplate.opsForValue().get(pay5));
+        }
+        // 京东收银台（PC）
+        String pay6 = String.format(PayConfigConstants.PAY_CONFIG_6, pkCountry);
+        if (redisTemplate.hasKey(pay6)) {
+            payConfigVO.setPay6((Boolean) redisTemplate.opsForValue().get(pay6));
+        }
 
         // 新汇付PC微信扫码支付
         String pay81 = String.format(PayConfigConstants.PAY_CONFIG_81, pkCountry);