配置收钱吧线上环境参数；添加非空校验注解

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

@@ -253,11 +253,11 @@ liquidnet:
 
 #application-dev-end
   sqb:
-    base-api: 'https://open-apisix.iwosai.com'
-    app-id: '2025082700005615'
-    app-key: '4d5c7647853bba34a0b5af42bc2400e7'
-    app-code: 'DWTY'
-    public-key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Hlg887xrRWYxPqLDX53oimjsxfd7PDdhQ4zHUYA1eQP6PMyhAo+GU/oq4RQVpW6LrG0PWA6CoD7qva6T0NwsDWn5/fmWhmH+Ad6K5WG5jY9ZVjnys9R+HGeFyE7hSkhqSgiSlEMv9IBJD5p9ZqBZ0FAPotMS/RIBHANVA37J0Zlp9wakvUegcXb3hl9xp+aRsjikhS5h89qiPPXGkWq9dsQrbpDODP8RziqskxzIzu4tYtvLkUZ/Ak9LCRu63SSGX+yAj24mG9Q+4taWGX32AmuVFK9CGDoec0IYx8ouUtiGWVBqZz0dRteKbBbL6MtnPjUxT+wMc6rarPL8zj9vwIDAQAB'
-    merchant-id: 'fd567f94-9a44-4ae5-879f-9acc919d0f89'
-    merchant-user-id: '42c556cc-1509-4de0-bfc3-dfbcb48eae57'
+    base-api: 'https://open-api.shouqianba.com'
+    app-id: '2026033100010967'
+    app-key: '5423d413f8349b186893892dcef6f76b'
+    app-code: 'MDWH'
+    public-key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuf1oOZm3u5NraTs4F8AABXbtU2jSiWYp+IWmQ36vokuq6s2s3eKQR6l4RkrPPxjC86bIvjT4pApJZJrFMA4YcjY4G49wFZySfom4IPaZlKsOrNGJH0Kag0BSO9U5el1z7dMz7oP9cChbdl4mjKuqYtgnNtaPT+SqhXRQdFcc9kiVybAGs8WEGqsdwxsmD9aZTd4rQMvLEGWIj/MLdo7w1avc0WVSPQSM5jRHjjQmUzEuusv+QGcDt3ttNaip2uo1xoQdcwILYmS6fnWL8xKw4V8lX0CWypUKIZcIc1Y/1N8VeUN+8MirdrS5JSghq62Yifu9A3W/mANB+S6yYwD+WQIDAQAB'
+    merchant-id: '17b9e0d9-125e-4507-8b76-a49ccedc7d82'
+    merchant-user-id: '088d4ccf-e92c-4000-93ca-5502bf48f943'
     role: 'super_admin'
\ No newline at end of file

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

@@ -252,11 +252,11 @@ liquidnet:
       privateKey: MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQCR3u0lL7LvLHK0VG8/FXcA6hjLC+oY4ra/zqs7QRg4EVR8GGQ1G3hg5av6LJxBN5lR07ONYojAOgzmxkoPdM4+aTn9XMfk2sAWen7RMMNcdpyx1eNdCFlm1GzT419CXkIS0Z+gUsxF+PasGamjzfB/Lg66DNZ1zHh1YPa/hwt4KKO1YHiReBCO0hLo7/uGTFUdfzB9pCUIzOTQwaYJPqRc0pz0/9MSF65K/Qtc9lqFpsVXmcWQOZZjoDJGIH6XEbyWXzMRPy5MLryvF3s6ZNURuU7j8t16DVkUTx3p+bEm2U3GmL5btltiouduPUBXHZjRUWAAyFVzc9EMQDQDA89rAgMBAAECggEAQPEHkQuoVPTr6D7C/EnZHk4aVaNrSEL+62veLdYwKx4EB+9wBXjCYhk+NHXR5vMSziw6/tIEYdg2UDOtWy48d+qvB45b7BY7eIZ2mTllcG/aGQ5JV+zUqIQgI0FR8qE2N1yd/Wl/ShOp9jrCnIud63Ec21XF0NIEOvW9RM2hnI+G6YLT9j3NbvJvB4zS7U7tejEXfDP1Oxtjk0ba7Qq04yYdeX16TOrs8VTpAzrj+xW/VJDLBoDfgLvE2G/PqhpFOFfH5V6zKTYfk9VQLh1H9dTj1CkFgRHEJfrFc7XcIIb9nxjnV5JXZmcPjmErQUg1t8JLzjJuQIvzCda5Ba9JEQKBgQDL+iSWlSfyJQyx283VIjhIJ3w9ZRAIWsm/Z1205tdnBeFAzsiItLamASf7Y1zMIMYxFyUD41npFUqetjzdxVHiWlOg2/cE7t2SQWbfrbgqwG0z23If4jUdIj3CJq9yLVWAXvvvm/I/Zrj4oGycYkWV0eGZwoAqIIHIOmTPslacUwKBgQC3Eve/jAHkcgCRppwvDvrw9AYKd6rrs9dyCcsj7Zz2sT7CTw89JcjmjwsLx5+v+zSGgkceG21uIusAfWoAbAYadIGP7zCOBWGVdFvt5hqqKtwL7sLdWrauKw5NId8SlVu0Jvy2dVjzyJ3jfYj1tXt/kCNLgf0zL4yZ+q9G+KBdiQKBgQCkNcSu1XVLIziNFv8lzl6w99i1NF8r2qsARB7UO+K9NaaZnd8i7xj7m4Kshtl2HAxyCMfr0WPYmSNxkhR+FRROvZkFrw+2EPaff7dp61iQUkmXrdq6gElyItbFLo+fw49JwS3hQBJNqEzRG5VUcGjErCqKtmKnh3Pz1c7CxjejsQKBgEbJ6cxCGdU4k6m+D7ROiY+z+8X+YbPEFXF+AfOBhGkLPiYqJc1SF+22r+G9La0BaFz+cPteRaEJlW7aD6vcGTwPgq2iIlc4E3STypwhlnvoGK/wgZ7P3cVY1q3ShAwOfqgZTyxKEbwp/YsiVlwT8Y3wsQUYXUx2fVpoyW+a4X9pAoGBAIQSQ/Dig/6kU7yb9F4uFYVGnrArQk9bFC3tXe1rgyw6nUq5txAmc6ovvrmCVMilQ2nfYuzAtuKy6ouf71u+nTDaTV9LxGOxKzSDu+58R8qZrzcnSerfPivocWmlpN5mse45RVRnlw3EvObCwKE3zkDYKk5PgxKsmLrLAgaF4CGg
 #application-test-end
   sqb:
-    base-api: 'https://open-apisix.iwosai.com'
-    app-id: '2025082700005615'
-    app-key: '4d5c7647853bba34a0b5af42bc2400e7'
-    app-code: 'DWTY'
-    public-key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA3Hlg887xrRWYxPqLDX53oimjsxfd7PDdhQ4zHUYA1eQP6PMyhAo+GU/oq4RQVpW6LrG0PWA6CoD7qva6T0NwsDWn5/fmWhmH+Ad6K5WG5jY9ZVjnys9R+HGeFyE7hSkhqSgiSlEMv9IBJD5p9ZqBZ0FAPotMS/RIBHANVA37J0Zlp9wakvUegcXb3hl9xp+aRsjikhS5h89qiPPXGkWq9dsQrbpDODP8RziqskxzIzu4tYtvLkUZ/Ak9LCRu63SSGX+yAj24mG9Q+4taWGX32AmuVFK9CGDoec0IYx8ouUtiGWVBqZz0dRteKbBbL6MtnPjUxT+wMc6rarPL8zj9vwIDAQAB'
-    merchant-id: 'fd567f94-9a44-4ae5-879f-9acc919d0f89'
-    merchant-user-id: '42c556cc-1509-4de0-bfc3-dfbcb48eae57'
+    base-api: 'https://open-api.shouqianba.com'
+    app-id: '2026033100010967'
+    app-key: '5423d413f8349b186893892dcef6f76b'
+    app-code: 'MDWH'
+    public-key: 'MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAuf1oOZm3u5NraTs4F8AABXbtU2jSiWYp+IWmQ36vokuq6s2s3eKQR6l4RkrPPxjC86bIvjT4pApJZJrFMA4YcjY4G49wFZySfom4IPaZlKsOrNGJH0Kag0BSO9U5el1z7dMz7oP9cChbdl4mjKuqYtgnNtaPT+SqhXRQdFcc9kiVybAGs8WEGqsdwxsmD9aZTd4rQMvLEGWIj/MLdo7w1avc0WVSPQSM5jRHjjQmUzEuusv+QGcDt3ttNaip2uo1xoQdcwILYmS6fnWL8xKw4V8lX0CWypUKIZcIc1Y/1N8VeUN+8MirdrS5JSghq62Yifu9A3W/mANB+S6yYwD+WQIDAQAB'
+    merchant-id: '17b9e0d9-125e-4507-8b76-a49ccedc7d82'
+    merchant-user-id: '088d4ccf-e92c-4000-93ca-5502bf48f943'
     role: 'super_admin'
\ No newline at end of file

liquidnet-bus-service/liquidnet-service-goblin/liquidnet-service-goblin-impl/src/test/java/com/liquidnet/service/goblin/test/GoblinShouQianBaServiceImplTest.java

@@ -30,9 +30,9 @@ public class GoblinShouQianBaServiceImplTest {
     public void queryMallListTest(){
 
         CommonRequest.Seller seller = new CommonRequest.Seller();
-        seller.setRole("super_admin");
-        seller.setMerchantId("fd567f94-9a44-4ae5-879f-9acc919d0f89");
-        seller.setMerchantUserId("42c556cc-1509-4de0-bfc3-dfbcb48eae57");
+        seller.setRole(sqbBiz.getSqbConfig().getRole());
+        seller.setMerchantId(sqbBiz.getSqbConfig().getMerchantId());
+        seller.setMerchantUserId(sqbBiz.getSqbConfig().getMerchantUserId());
 
         MallListQueryRequest.Filter filter = new MallListQueryRequest.Filter();
         filter.setSeller(seller);
@@ -46,7 +46,7 @@ public class GoblinShouQianBaServiceImplTest {
         sort.setSortField("id");
 
         MallListQueryRequest mallListQueryRequest = new MallListQueryRequest();
-        mallListQueryRequest.setAppid("2025082700005615");
+        mallListQueryRequest.setAppid(sqbBiz.getSqbConfig().getAppId());
         mallListQueryRequest.setFilter(filter);
         mallListQueryRequest.setCursor(cursor);
         mallListQueryRequest.setSort(sort);

liquidnet-bus-service/liquidnet-service-order/liquidnet-service-order-impl/src/main/java/com/liquidnet/service/order/controller/GoblinSqbOrderController.java

@@ -26,6 +26,7 @@ import javax.validation.constraints.NotBlank;
 @Api(tags = "商城-收钱吧支付相关")
 @RestController
 @RequestMapping("/goblin/sqb")
+@Validated
 public class GoblinSqbOrderController {
 
     @Autowired
@@ -60,8 +61,8 @@ public class GoblinSqbOrderController {
     @GetMapping("/pay/status")
     @ApiOperation("查询支付状态")
     @ApiImplicitParam(type = "query", required = true, dataType = "String", name = "orderId", value = "本地订单ID")
-    public ResponseDto<Integer> queryPayStatus(
-            @NotBlank(message = "orderId 不能为空") @RequestParam("orderId") String orderId) {
+    public ResponseDto<Integer> queryPayStatus(@NotBlank(message = "orderId 不能为空")
+                                                   @RequestParam("orderId") String orderId) {
 
         String userId = CurrentUtil.getCurrentUid();
         log.info("[收钱吧支付状态] 接收请求 userId={}, orderId={}", userId, orderId);