Merge branch 'dev-1.6-shouqianba' into container-test

liquidnet-bus-api/liquidnet-service-goblin-api/src/main/java/com/liquidnet/service/goblin/dto/manage/GoblinStoreMgtGoodsSqbAddParam.java

@@ -134,9 +134,9 @@ public class GoblinStoreMgtGoodsSqbAddParam implements Serializable {
         vo.setCoverPic(CollectionUtil.isEmpty(sqbGoods.getConverImages()) ? "" : sqbGoods.getConverImages().get(0));
         vo.setVideo("");
         vo.setSpecMode("1");
-        vo.setCateFid("2690132621531");
-        vo.setCateSid("2690132639617");
-        vo.setCateTid("2690132656988");
+        vo.setCateFid("26139143843740");
+        vo.setCateSid("26139143903998");
+        vo.setCateTid("26139143921511");
         vo.setShelvesHandle("1");
         vo.setShelvesTime(null);
         vo.setVirtualFlg("1");

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-sqb/src/main/java/com/liquidnet/common/third/sqb/biz/SqbBiz.java

@@ -90,12 +90,24 @@ public class SqbBiz {
      * @return
      */
     public SettlementCreateData createSettlement(String mallSn, String signature, String userId, List<SettlementCreateRequest.CheckoutItem> checkoutItems) {
+        return createSettlement(mallSn, signature, userId, checkoutItems, null);
+    }
+
+    /**
+     * @param totalAmountFen 纯金额结算时传总金额（分）；商品结算(type=1 的 checkoutItems) 须传 null，勿与 checkoutItems 同时带 amount
+     */
+    public SettlementCreateData createSettlement(String mallSn, String signature, String userId,
+                                                 List<SettlementCreateRequest.CheckoutItem> checkoutItems,
+                                                 Long totalAmountFen) {
         SettlementCreateRequest request = new SettlementCreateRequest();
         request.setAppid(sqbConfig.getAppId());
         request.setMallID(buildMall(mallSn, signature));
         request.setSeller(cachedSeller);
         request.setBuyer(buildBuyer(userId));
         request.setCheckoutItems(checkoutItems);
+        if (totalAmountFen != null) {
+            request.setAmount(totalAmountFen);
+        }
         return createSettlement(request);
     }
 
@@ -179,7 +191,7 @@ public class SqbBiz {
      * @param acquiringSn       收单号
      * @param signature         收单签名
      * @param userId            正在用户ID
-     * @param amount            支付金额
+     * @param amount            支付金额（分，字符串，如 "3" 表示 0.03 元）
      * @param requestSn         支付请求号
      * @param payTool           支付工具代码
      * @param channelExt        通道扩展参数 {"sub_appid":"wx36e68952a6"}

liquidnet-bus-common/liquidnet-common-third/liquidnet-common-third-sqb/src/main/java/com/liquidnet/common/third/sqb/param/request/SettlementCreateRequest.java

@@ -42,7 +42,7 @@ public class SettlementCreateRequest implements Serializable {
     private List<CheckoutItem> checkoutItems;
 
     /**
-     * 结算总金额（单位：分）
+     * 结算总金额（单位：分）；纯金额结算时必填。商品结算走 checkoutItems 且 type=1 时不要传
      */
     private Long amount;
 

liquidnet-bus-config/liquidnet-config/application-dev.yml

@@ -267,9 +267,9 @@ liquidnet:
 #application-dev-end
   sqb:
     base-api: 'https://open-api.shouqianba.com'
-    app-id: '2026040900011060'
-    app-key: '5cd1e48eba44a5264914115cd31df494'
-    app-code: 'MDTEST'
+    app-id: '2026033100010967'
+    app-key: '5423d413f8349b186893892dcef6f76b'
+    app-code: 'MDWH'
     public-key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuf1oOZm3u5NraTs4F8AABXbtU2jSiWYp+IWmQ36vokuq6s2s3eKQR6l4RkrPPxjC86bIvjT4pApJZJrFMA4YcjY4G49wFZySfom4IPaZlKsOrNGJH0Kag0BSO9U5el1z7dMz7oP9cChbdl4mjKuqYtgnNtaPT+SqhXRQdFcc9kiVybAGs8WEGqsdwxsmD9aZTd4rQMvLEGWIj/MLdo7w1avc0WVSPQSM5jRHjjQmUzEuusv+QGcDt3ttNaip2uo1xoQdcwILYmS6fnWL8xKw4V8lX0CWypUKIZcIc1Y/1N8VeUN+8MirdrS5JSghq62Yifu9A3W/mANB+S6yYwD+WQIDAQAB'
     merchant-id: 'b2d63146-934f-401f-a864-14926d952c16'
     merchant-user-id: '6d0d632e-50e9-464e-bbb3-be76047ec835'

liquidnet-bus-config/liquidnet-config/application-test.yml

@@ -265,9 +265,9 @@ liquidnet:
 #application-test-end
   sqb:
     base-api: 'https://open-api.shouqianba.com'
-    app-id: '2026040900011060'
-    app-key: '5cd1e48eba44a5264914115cd31df494'
-    app-code: 'MDTEST'
+    app-id: '2026033100010967'
+    app-key: '5423d413f8349b186893892dcef6f76b'
+    app-code: 'MDWH'
     public-key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuf1oOZm3u5NraTs4F8AABXbtU2jSiWYp+IWmQ36vokuq6s2s3eKQR6l4RkrPPxjC86bIvjT4pApJZJrFMA4YcjY4G49wFZySfom4IPaZlKsOrNGJH0Kag0BSO9U5el1z7dMz7oP9cChbdl4mjKuqYtgnNtaPT+SqhXRQdFcc9kiVybAGs8WEGqsdwxsmD9aZTd4rQMvLEGWIj/MLdo7w1avc0WVSPQSM5jRHjjQmUzEuusv+QGcDt3ttNaip2uo1xoQdcwILYmS6fnWL8xKw4V8lX0CWypUKIZcIc1Y/1N8VeUN+8MirdrS5JSghq62Yifu9A3W/mANB+S6yYwD+WQIDAQAB'
     merchant-id: 'b2d63146-934f-401f-a864-14926d952c16'
     merchant-user-id: '6d0d632e-50e9-464e-bbb3-be76047ec835'

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/main/java/com/liquidnet/service/goblin/service/impl/GoblinSqbServiceImpl.java

@@ -51,6 +51,9 @@ public class GoblinSqbServiceImpl implements IGoblinSqbService {
     private SqbBiz sqbBiz;
     private static final DateTimeFormatter DTF = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
 
+    /** 与下单结算 CheckoutItem.type 一致：1=自定义商品（按实付单价下单时） */
+    private static final byte SQB_LINE_ITEM_TYPE_CUSTOM = 1;
+
     @Autowired
     private GoblinSqbOrderMapper goblinSqbOrderMapper;
 
@@ -224,7 +227,7 @@ public class GoblinSqbServiceImpl implements IGoblinSqbService {
             item.setTitle(orderSkuVo.getSkuName());
             item.setImg(orderSkuVo.getSkuImage());
             item.setQuantity(String.valueOf(orderSkuVo.getNum()));
-            item.setType((byte) 0);
+            item.setType(SQB_LINE_ITEM_TYPE_CUSTOM);
             refundItems.add(item);
         }
         return refundItems;

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/utils/GoblinSqbConvertUtils.java

 package com.liquidnet.service.order.utils;
 
-
 import java.math.BigDecimal;
 import java.math.RoundingMode;