Merge branch 'master' into test

src/main/java/com/ydtech/modules/order/service/impl/IdentifyServiceImpl.java

@@ -71,7 +71,7 @@ public class IdentifyServiceImpl implements IdentifyService {
             if (StringUtils.isNotBlank(s2) && !ObjectUtil.isAllFieldNull(redisTemplate.opsForValue().get(s2Key))) {
                 //走缓存
                 CustomerInfoVO customerInfoVO2 = new CustomerInfoVO();
-                BeanUtils.copyProperties(Objects.requireNonNull(redisTemplate.opsForValue().get(s2Key)), customerInfoVO);
+                BeanUtils.copyProperties(Objects.requireNonNull(redisTemplate.opsForValue().get(s2Key)), customerInfoVO2);
                 Idcard.conversionBack(customerInfoVO, customerInfoVO2);
             } else {
                 //识别身份证背面
@@ -97,7 +97,7 @@ public class IdentifyServiceImpl implements IdentifyService {
             if (StringUtils.isNotBlank(s1) && !ObjectUtil.isAllFieldNull(redisTemplate.opsForValue().get(s1Key))) {
                 //走缓存
                 CardUserInfo cardUserInfo1 = new CardUserInfo();
-                BeanUtils.copyProperties(Objects.requireNonNull(redisTemplate.opsForValue().get(s1Key)), cardUserInfo);
+                BeanUtils.copyProperties(Objects.requireNonNull(redisTemplate.opsForValue().get(s1Key)), cardUserInfo1);
                 MultiObjectDetect.conversionFront(cardUserInfo, cardUserInfo1);
 
             } else {

src/main/java/com/ydtech/utils/baidu/Idcard.java

@@ -145,7 +145,7 @@ public class Idcard {
     }
 
     public static void conversionBack(CustomerInfoVO customerInfo, CustomerInfoVO customerInfoNew) {
-        customerInfo.setIdentifyValidDate(customerInfoNew.getName());
+        customerInfo.setIdentifyValidDate(customerInfoNew.getIdentifyValidDate());
         customerInfo.setIdentifyValidEndDate(customerInfoNew.getIdentifyValidEndDate());
     }