冻结保证金

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

@@ -29,4 +29,7 @@ public class PageOwnerAccountRunningWaterParam extends PageParam {
     @ApiModelProperty(value = "操作结束时间",example = "2020-01-01 10:10:10")
     private String endTime;
 
+    @ApiModelProperty(value="货主编码",example = "20145787812312312")
+    private Long ownerUserNo;
+
 }

performance-web/src/main/java/com/clx/performance/model/OwnerRunningWaterRecord.java

@@ -42,8 +42,8 @@ public class OwnerRunningWaterRecord implements HasKey<Integer> {
     /**
      * 货主名称
      */
-    @TableField("owner_name")
-    private String ownerName;
+    @TableField("owner_user_name")
+    private String ownerUserName;
     /**
      * 联系电话
      */

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

@@ -74,11 +74,15 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
     @Override
     public IPage<OwnerAccountRunningWaterRecordVO> marginAccountPageList(PagePlatformMarginAccountParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        param.setOwnerUserNo(loginUserInfo.getUserNo());
         return ownerRunningWaterRecordDao.marginAccountPageList(param);
     }
 
     @Override
     public IPage<OwnerAccountRunningWaterRecordVO> prepaidFreightAccountPageList(PagePlatformPrepaidFreightAccountParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        param.setOwnerUserNo(loginUserInfo.getUserNo());
         return ownerRunningWaterRecordDao.prepaidFreightAccountPageList(param);
     }
 
@@ -169,7 +173,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         ownerCaseOutDao.saveEntity(entity);
         //插入冻结流水
         OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
-        runningWaterRecord.setOwnerName(loginUserInfo.getUserName());
+        runningWaterRecord.setOwnerUserName(loginUserInfo.getUserName());
         runningWaterRecord.setMobile(loginUserInfo.getUserMobile());
         runningWaterRecord.setCreateBy(loginUserInfo.getUserName());
         runningWaterRecord.setRelationId(entity.getCaseOutNo());
@@ -216,7 +220,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         ownerCaseOutDao.saveEntity(entity);
         //插入冻结流水
         OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
-        runningWaterRecord.setOwnerName(loginUserInfo.getUserName());
+        runningWaterRecord.setOwnerUserName(loginUserInfo.getUserName());
         runningWaterRecord.setMobile(loginUserInfo.getUserMobile());
         runningWaterRecord.setCreateBy(loginUserInfo.getUserName());
         runningWaterRecord.setRelationId(entity.getCaseOutNo());
@@ -272,7 +276,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
             ownerTopUpDao.updateEntityByKey(entity);
             //需要插入充值流水
             OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
-            runningWaterRecord.setOwnerName(ownerName);
+            runningWaterRecord.setOwnerUserName(ownerName);
             runningWaterRecord.setMobile(loginUserInfo.getUserMobile());
             runningWaterRecord.setCreateBy(loginUserInfo.getUserName());
 
@@ -336,7 +340,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
         //插入提现成功流水
         OwnerRunningWaterRecord runningWaterRecord = new OwnerRunningWaterRecord();
-        runningWaterRecord.setOwnerName(loginUserInfo.getUserName());
+        runningWaterRecord.setOwnerUserName(loginUserInfo.getUserName());
         runningWaterRecord.setMobile(loginUserInfo.getUserMobile());
         runningWaterRecord.setCreateBy(loginUserInfo.getUserName());
 
@@ -650,7 +654,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
         log.info("插入保证金冻结流水");
         //插入保证金冻结流水
         OwnerRunningWaterRecord marginAccount = new OwnerRunningWaterRecord();
-        marginAccount.setOwnerName(ownerName);
+        marginAccount.setOwnerUserName(ownerName);
         marginAccount.setMobile(mobile);
         marginAccount.setCreateBy("系统");
         marginAccount.setOrderId(orderId);
@@ -668,7 +672,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
 
         //插入预付运费冻结流水
         OwnerRunningWaterRecord prepaidFreight = new OwnerRunningWaterRecord();
-        prepaidFreight.setOwnerName(ownerName);
+        prepaidFreight.setOwnerUserName(ownerName);
         prepaidFreight.setMobile(mobile);
         prepaidFreight.setCreateBy("系统");
         prepaidFreight.setOrderId(orderId);

performance-web/src/main/java/com/clx/performance/sqlProvider/OwnerRunningWaterRecordSqlProvider.java

@@ -66,6 +66,7 @@ public class OwnerRunningWaterRecordSqlProvider {
                     " a.owner_user_name, a.mobile, a.account_type, a.running_water_type,a.order_id,a.order_no,a.order_child_id,a.order_child_no,a.alteration_balance," +
                     " a.account_balance,a.usable_balance, a.frozen_balance,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time");
             FROM("owner_running_water_record a");
+            WHERE("a.owner_user_no = #{param.ownerUserNo}");
 
             if (ObjectUtil.isNotNull(param.getAccountType())) {
                 WHERE("a.account_type = #{param.accountType}");
@@ -76,6 +77,7 @@ public class OwnerRunningWaterRecordSqlProvider {
             if (ObjectUtil.isNotNull(param.getRunningWaterType())) {
                 WHERE("a.running_water_type = #{param.runningWaterType}");
             }
+
             ORDER_BY("a.create_time desc");
         }}.toString();
         return sql;