Merge remote-tracking branch 'origin/developer_bw' into developer_bw

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

@@ -287,7 +287,7 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 				Map<String, String> data = JSONObject.parseObject(decode, Map.class);
 				log.debug("解密后参数:{}", data);// 进行自己的处理,此处默认处理成功，返回通知方成功,return_code=0
 				// 其中certNo、custName、newPayAcc字段进行了base64编码，可以调用示例代码中的base64Decode进行解码
-				String custName = base64Decode(data.get("custName"));
+				//String custName = base64Decode(data.get("custName"));
 				String certNo = base64Decode(data.get("certNo"));
 				String newPayAcc = base64Decode(data.get("newPayAcc"));
 				String outUserId = data.get("outUserId");
@@ -301,13 +301,6 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 				if (hygfIcbcRecord == null) {
 					hygfIcbcRecord = new HygfIcbcRecord();
 				}
-				hygfIcbcRecord.setCustName(custName);
-				hygfIcbcRecord.setIdCard(certNo);
-
-				hygfIcbcRequest.setPhase("组装");
-				hygfIcbcRequest.setException(data.get("custName") + " -> " + custName);
-				hygfIcbcRequestMapper.updateById(hygfIcbcRequest);
-
 				PeasantHousehold peasantHousehold = peasantHouseholdService.lambdaQuery()
 						.select(PeasantHousehold::getTelephone).eq(PeasantHousehold::getAmosUserId, outUserId)
 						.last("limit 1").one();
@@ -316,6 +309,12 @@ public class HygfIcbcServiceImpl extends BaseService<HygfIcbcRecordDTO, HygfIcbc
 				hygfIcbcRecord.setProjectId(projectId);
 				hygfIcbcRecord.setOpenAccountStatus(openAccoutSucceedFlag);
 				hygfIcbcRecord.setSignEntrsutPrtlStatus(signEntrsutPrtlSucceedFlag);
+				hygfIcbcRecord.setCustName(peasantHousehold.getOwnersName());
+				hygfIcbcRecord.setIdCard(certNo);
+				hygfIcbcRequest.setPhase("组装");
+				hygfIcbcRequest.setException(data.get("custName") + " -> " + peasantHousehold.getOwnersName());
+				hygfIcbcRequestMapper.updateById(hygfIcbcRequest);
+				
 				if (hygfIcbcWalletInfo != null) {
 					hygfIcbcRecord.setCustName(hygfIcbcWalletInfo.getCustName());
 					hygfIcbcRecord.setIdCard(hygfIcbcWalletInfo.getCertNo());