对接聚富通

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/resources/mapper/mysql/HygfIcbcRecordMapper.xml

@@ -10,9 +10,10 @@
     </sql>
 
     <select id="listObjectCount" resultType="integer">
-        SELECT count(1)
+        SELECT
+            count( DISTINCT ph.amos_user_id )
         FROM
-        hygf_peasant_household ph LEFT JOIN hygf_icbc_record icbc ON ph.amos_user_id = icbc.amos_user_id
+            hygf_peasant_household ph LEFT JOIN hygf_icbc_record icbc ON ph.amos_user_id = icbc.amos_user_id
         <where>
             ph.is_delete = 0
             <if test="param != null">
@@ -33,8 +34,6 @@
                 </if>
             </if>
         </where>
-        GROUP BY
-        ph.amos_user_id
     </select>
 
     <select id="listObject" resultType="com.yeejoin.amos.boot.module.hygf.api.dto.HygfIcbcRecordDTO">

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/HygfIcbcController.java

@@ -85,14 +85,14 @@ public class HygfIcbcController extends BaseController {
         return hygfIcbcService.registerWalletCallback(request, response);
     }
 
-    @TycloudOperation (ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
     @GetMapping (value = "/{sequenceNbr}")
     @ApiOperation (httpMethod = "GET", value = "根据sequenceNbr查询注册电子钱包", notes = "注册电子钱包")
     public ResponseModel<HygfIcbcRecordDTO> getObject(@PathVariable String sequenceNbr) {
         return ResponseHelper.buildResponse(hygfIcbcService.getObject(Long.valueOf(sequenceNbr)));
     }
 
-    @TycloudOperation (ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation (ApiLevel = UserType.AGENCY)
     @GetMapping (value = "/list")
     @ApiOperation (httpMethod = "GET", value = "聚富通电子钱包列表查询", notes = "聚富通电子钱包列表查询")
     @UserLimits

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -248,4 +248,4 @@ spring.elasticsearch.rest.password=123456
 spring.elasticsearch.rest.read-timeout=30000
 
 ## 聚富通 配置
-hygf.icbc.callbackUrl=http://47.92.234.253:8088/hygf/icbc/notify
+hygf.icbc.callbackUrl=https://yth.yunqingtech.com/hygf/icbc/notify
\ No newline at end of file