Merge remote-tracking branch 'origin/v7.0_small_version_fix_20231120' into…

performance-api/src/main/java/com/clx/performance/param/pc/OwnerBindCardParam.java

@@ -25,4 +25,7 @@ public class OwnerBindCardParam {
 
     @ApiModelProperty(value = "银行账户")
     private String ownerBankAccount;
+
+    @ApiModelProperty(value = "交易密码")
+    private String accountPassword;
 }

performance-web/src/main/java/com/clx/performance/service/impl/OwnerAccountServiceImpl.java

@@ -114,6 +114,8 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
     @Override
     public IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightOwnerAccountPageList(PageAppPrepaidFreightAccountParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        param.setUserNo(loginUserInfo.getUserNo());
         return ownerRunningWaterRecordDao.prepaidFreightOwnerAccountPageList(param);
     }
 
@@ -602,7 +604,17 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     @Override
     public void bindOwnerBindCard(OwnerBindCardParam param) {
         UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
-
+        if (StringUtils.equals(loginUserInfo.getProductCode(), "carrier-owner-app")) {
+            OwnerAccountPassword entity = ownerAccountPasswordDao.findEntityByUserNo(loginUserInfo.getUserNo());
+            try {
+                boolean b = MyMD5Util.validPassword(param.getAccountPassword(), entity.getPassword());
+                if (!b) {
+                    throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL);
+                }
+            } catch (Exception e) {
+                throw new ServiceSystemException(PerformanceResultEnum.PASSWORD_CHECK_FAIL);
+            }
+        }
         Result<OwnerBindCardVO> result = ownerInfoFeign.getOwnerInfoVO(loginUserInfo.getUserNo());
         if (!result.succeed()) {
             throw new ServiceSystemException(PerformanceResultEnum.HTTP_ERROR, "当前参数未查询到有效数据");