Merge branch 'developer' of http://36.40.66.175:5000/moa/jxdj_zx/amos-boot-zx-biz into developer

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/Enum/IcbcEnum.java

@@ -65,7 +65,7 @@ public class IcbcEnum {
     @Getter
     @NoArgsConstructor
     @AllArgsConstructor
-    enum ProtocolStatus {
+    public static enum ProtocolStatus {
 
         NOT_EFFECTIVE("未生效", "0"),
 
@@ -86,5 +86,17 @@ public class IcbcEnum {
          */
         private String code;
 
+        public static String getNameByCode(String code, String defaultName) {
+            for (ProtocolStatus state : ProtocolStatus.values()) {
+                if (state.getCode().equals(code)) {
+                    return state.getName();
+                }
+            }
+            if (StringUtils.isNotEmpty(defaultName)) {
+                return defaultName;
+            }
+            return null;
+        }
+
     }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/HygfIcbcRecordQueryDTO.java

@@ -32,10 +32,10 @@ public class HygfIcbcRecordQueryDTO {
     private String phone;
 
     @ApiModelProperty (value = "区域公司")
-    private String regionalCompaniesSeq;
+    private String regionalCompaniesName;
 
     @ApiModelProperty (value = "所属地址")
-    private String address;
+    private String addressName;
 
     private Integer current;
 

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

@@ -29,8 +29,11 @@
                 <if test="param.phone != null and param.phone != ''">
                     AND ph.telephone LIKE CONCAT('%', #{param.phone}, '%')
                 </if>
-                <if test="param.regionalCompaniesSeq != null and param.regionalCompaniesSeq != ''">
-                    AND ph.regional_companies_seq = #{param.regionalCompaniesSeq}
+                <if test="param.regionalCompaniesName != null and param.regionalCompaniesName != ''">
+                    AND ph.regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')
+                </if>
+                <if test="param.addressName != null and param.addressName != ''">
+                    AND ph.project_address LIKE CONCAT('%', #{param.addressName}, '%')
                 </if>
             </if>
         </where>
@@ -62,8 +65,11 @@
                 <if test="param.phone != null and param.phone != ''">
                     AND ph.telephone LIKE CONCAT('%', #{param.phone}, '%')
                 </if>
-                <if test="param.regionalCompaniesSeq != null and param.regionalCompaniesSeq != ''">
-                    AND ph.regional_companies_seq = #{param.regionalCompaniesSeq}
+                <if test="param.regionalCompaniesName != null and param.regionalCompaniesName != ''">
+                    AND ph.regional_companies_name LIKE CONCAT('%', #{param.regionalCompaniesName}, '%')
+                </if>
+                <if test="param.addressName != null and param.addressName != ''">
+                    AND ph.project_address LIKE CONCAT('%', #{param.addressName}, '%')
                 </if>
             </if>
         </where>

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

@@ -86,10 +86,10 @@ public class HygfIcbcController extends BaseController {
     }
 
     @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)));
+    @GetMapping (value = "/{userId}")
+    @ApiOperation (httpMethod = "GET", value = "根据农户userId查询注册电子钱包", notes = "注册电子钱包")
+    public ResponseModel<HygfIcbcRecordDTO> getObject(@PathVariable String userId) {
+        return ResponseHelper.buildResponse(hygfIcbcService.getObject(userId));
     }
 
     @TycloudOperation (ApiLevel = UserType.AGENCY)

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/HygfIcbcServiceImpl.java

@@ -3,6 +3,7 @@ package com.yeejoin.amos.boot.module.hygf.biz.service.impl;
 import cn.hutool.core.codec.Base64;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.icbc.api.DefaultIcbcClient;
 import com.icbc.api.IcbcApiException;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -37,6 +38,7 @@ import java.net.URLDecoder;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Arrays;
 import java.util.Calendar;
 import java.util.Date;
 import java.util.HashMap;
@@ -45,6 +47,9 @@ import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Function;
+import java.util.function.Predicate;
 import java.util.stream.Collectors;
 
 
@@ -147,7 +152,7 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
             bizContent.setProtocolEndDate(formattedDate); // 协议到期日
             bizContent.setProtocolLimitAmount(protocolLimitAmount); // 协议累计额
             JSONObject templateParams = new JSONObject();
-            templateParams.put("prtl_enddate", formattedDate);//协议到期日
+            templateParams.put("prtl_enddate", formattedDate);// 协议到期日
             templateParams.put("loan_total_amt", loanTotalAmt);// 贷款限额（单位：分）
             templateParams.put("trx_lmt_amt", trxLmtAmt);// 单笔限额（单位：分）
             templateParams.put("day_lmt_amt", dayLmtAmt);// 日累计限额（单位：分）
@@ -288,8 +293,29 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
         return returnJson;
     }
 
-    public HygfIcbcRecordDTO getObject(Long sequenceNbr) {
-        HygfIcbcRecordDTO hygfIcbcRecordDTO = this.queryBySeq(sequenceNbr);
+    public HygfIcbcRecordDTO getObject(String amosUserId) {
+        HygfIcbcRecord hygfIcbcRecord = this.lambdaQuery().eq(HygfIcbcRecord::getAmosUserId, amosUserId).one();
+        HygfIcbcRecordDTO hygfIcbcRecordDTO = new HygfIcbcRecordDTO();
+        if (hygfIcbcRecord == null) {
+            PeasantHousehold peasantHousehold = peasantHouseholdService.lambdaQuery()
+                                                                       .select(PeasantHousehold::getTelephone, PeasantHousehold::getOwnersName, PeasantHousehold::getIdCard)
+                                                                       .eq(PeasantHousehold::getAmosUserId, amosUserId).last("limit 1").one();
+
+            hygfIcbcRecordDTO.setCustName(peasantHousehold.getOwnersName());
+            hygfIcbcRecordDTO.setIdCard(peasantHousehold.getIdCard());
+            hygfIcbcRecordDTO.setPhone(peasantHousehold.getTelephone());
+            hygfIcbcRecordDTO.setOpenAccountStatus(IcbcEnum.OpenAccountState.INITIAL.getCode());
+            hygfIcbcRecordDTO.setOpenAccountStatusName(IcbcEnum.OpenAccountState.getNameByCode(IcbcEnum.OpenAccountState.INITIAL.getCode(), IcbcEnum.OpenAccountState.INITIAL.getName()));
+        } else {
+            Bean.toModel(hygfIcbcRecord, hygfIcbcRecordDTO);
+            List<String> amosUserIds = Arrays.asList(hygfIcbcRecordDTO.getAmosUserId());
+            List<PeasantHousehold> peasantHouseholds = peasantHouseholdService.lambdaQuery().in(PeasantHousehold::getAmosUserId, amosUserIds).list();
+            Map<String, List<PeasantHousehold>> PeasantHouseholdMap = peasantHouseholds.stream().collect(Collectors.groupingBy(PeasantHousehold::getAmosUserId));// 根据农户 ID 分组
+            hygfIcbcRecordDTO.setOpenAccountStatusName(IcbcEnum.OpenAccountState.getNameByCode(hygfIcbcRecordDTO.getOpenAccountStatus(), IcbcEnum.OpenAccountState.INITIAL.getName()));
+            hygfIcbcRecordDTO.setProtocolStatusName(IcbcEnum.ProtocolStatus.getNameByCode(hygfIcbcRecordDTO.getProtocolStatus(), ""));
+            List<PeasantHousehold> peasantHouseholdList = PeasantHouseholdMap.get(hygfIcbcRecordDTO.getAmosUserId());
+            hygfIcbcRecordDTO.setPeasantHouseholds(Bean.toModels(peasantHouseholdList, HygfIcbcRecordDTO.IcbcPeasantHousehold.class));
+        }
         return hygfIcbcRecordDTO;
     }
 
@@ -322,12 +348,17 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
             return Collections.emptyList();
         }
         List<String> amosUserIds = hygfIcbcRecords.stream().map(HygfIcbcRecordDTO::getAmosUserId).collect(Collectors.toList());
-        List<PeasantHousehold> peasantHouseholds = peasantHouseholdService.lambdaQuery().in(PeasantHousehold::getAmosUserId, amosUserIds).list();
+        List<PeasantHousehold> peasantHouseholds = peasantHouseholdService.lambdaQuery().select(PeasantHousehold::getAmosUserId, PeasantHousehold::getRegionalCompaniesName).in(PeasantHousehold::getAmosUserId, amosUserIds).list();
         Map<String, List<PeasantHousehold>> PeasantHouseholdMap = peasantHouseholds.stream().collect(Collectors.groupingBy(PeasantHousehold::getAmosUserId));// 根据农户 ID 分组
         return hygfIcbcRecords.stream().map(hygfIcbcRecordDTO -> {
             hygfIcbcRecordDTO.setOpenAccountStatusName(IcbcEnum.OpenAccountState.getNameByCode(hygfIcbcRecordDTO.getOpenAccountStatus(), IcbcEnum.OpenAccountState.INITIAL.getName()));
+            hygfIcbcRecordDTO.setProtocolStatusName(IcbcEnum.ProtocolStatus.getNameByCode(hygfIcbcRecordDTO.getProtocolStatus(), ""));
             List<PeasantHousehold> peasantHouseholdList = PeasantHouseholdMap.get(hygfIcbcRecordDTO.getAmosUserId());
-            hygfIcbcRecordDTO.setPeasantHouseholds(Bean.toModels(peasantHouseholdList, HygfIcbcRecordDTO.IcbcPeasantHousehold.class));
+            if (!CollectionUtils.isEmpty(peasantHouseholdList)) {
+                // 根据区域经销商名称去重
+                List<HygfIcbcRecordDTO.IcbcPeasantHousehold> icbcPeasantHouseholds = Bean.toModels(peasantHouseholdList, HygfIcbcRecordDTO.IcbcPeasantHousehold.class);
+                hygfIcbcRecordDTO.setPeasantHouseholds(icbcPeasantHouseholds.stream().filter(distinctByKey(HygfIcbcRecordDTO.IcbcPeasantHousehold::getRegionalCompaniesName)).collect(Collectors.toList()));
+            }
             return hygfIcbcRecordDTO;
         }).collect(Collectors.toList());
     }
@@ -353,7 +384,7 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
         String biz_content = request.getParameter("biz_content");
         String sign_type = request.getParameter("sign_type");
         String sign = request.getParameter("sign");
-        log.info("verifySignData入参，from：[[{}]], api：[[{}]], app_id：[[{}]], charset：[[{}]], format：[[{}]], encrypt_type：[[{}]], timestamp：[[{}]], biz_content：[[{}]], sign_type：[[{}]], sign：[[{}]]",from, api, app_id, charset, format, encrypt_type);
+        log.info("verifySignData入参，from：[[{}]], api：[[{}]], app_id：[[{}]], charset：[[{}]], format：[[{}]], encrypt_type：[[{}]], timestamp：[[{}]], biz_content：[[{}]], sign_type：[[{}]], sign：[[{}]]", from, api, app_id, charset, format, encrypt_type);
         params.put("from", from);
         params.put("api", api);
         params.put("app_id", app_id);
@@ -408,4 +439,9 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
         byte[] bt = Base64.decode(String.valueOf(ch));
         return new String(bt, "UTF-8");
     }
+
+    public static <T> Predicate<T> distinctByKey(Function<? super T, Object> distinctField) {
+        Map<Object, Boolean> distinctMap = new ConcurrentHashMap<>();
+        return object -> distinctMap.putIfAbsent(distinctField.apply(object), Boolean.TRUE) == null;
+    }
 }
\ No newline at end of file