冻结资金相关

performance-web/src/main/java/com/clx/performance/dao/impl/OwnerAccountDaoImpl.java

@@ -9,6 +9,7 @@ import com.clx.performance.param.pc.PageOwnerAccountListParam;
 import com.clx.performance.struct.OwnerAccountStruct;
 import com.clx.performance.vo.pc.OwnerAccountVO;
 import com.msl.common.dao.impl.BaseDaoImpl;
+import com.msl.common.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
 
@@ -45,10 +46,11 @@ public class OwnerAccountDaoImpl extends BaseDaoImpl<OwnerAccountMapper, OwnerAc
 
     @Override
     public Integer updateAccountCAS(OwnerAccount account, LocalDateTime now, boolean flag) {
+        String nowStr = DateUtils.formatDateTime(now,"yyyy-MM-dd HH:mm:ss").get();
         if (flag) {
-            return baseMapper.addAccount(account, now);
+            return baseMapper.addAccount(account, nowStr);
         } else {
-            return baseMapper.subAccount(account, now);
+            return baseMapper.subAccount(account, nowStr);
         }
     }
 

performance-web/src/main/java/com/clx/performance/mapper/OwnerAccountMapper.java

@@ -7,8 +7,11 @@ import com.clx.performance.model.OwnerAccount;
 import com.clx.performance.param.pc.PageOwnerAccountListParam;
 import com.clx.performance.sqlProvider.OwnerAccountSqlProvider;
 import com.clx.performance.vo.pc.OwnerAccountVO;
+import com.msl.common.utils.DateUtils;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.SelectProvider;
+import org.apache.ibatis.annotations.Update;
 
 import java.time.LocalDateTime;
 import java.util.List;
@@ -22,11 +25,20 @@ public interface OwnerAccountMapper extends BaseMapper<OwnerAccount> {
     @SelectProvider(type = OwnerAccountSqlProvider.class, method = "pageList")
     IPage<OwnerAccountVO> pageList(Page<OwnerAccountVO> page, PageOwnerAccountListParam param);
 
-    @SelectProvider(type = OwnerAccountSqlProvider.class, method = "addAccount")
-    Integer addAccount(OwnerAccount account, LocalDateTime now);
+//    @SelectProvider(type = OwnerAccountSqlProvider.class, method = "addAccount")
+    @Update("update owner_account set usable_balance = usable_balance + #{account.usableBalance}"
+    +",account_balance = account_balance + #{account.accountBalance}"
+            +",modified_time= #{now}"
+            +"where id = #{account.id} and modified_time = #{account.modifiedTime}"
+    )
+    Integer addAccount(@Param("account") OwnerAccount account, @Param("now")String now);
 
-    @SelectProvider(type = OwnerAccountSqlProvider.class, method = "subAccount")
-    Integer subAccount(OwnerAccount account, LocalDateTime now);
+    @Update("update owner_account set usable_balance = usable_balance - #{account.usableBalance}," +
+            "frozen_balance = frozen_balance + #{account.frozenBalance},account_balance = account_balance - #{account.accountBalance}," +
+            "modified_time=#{now}"
+            +"where id = #{account.id} and modified_time = #{account.modifiedTime}"
+            )
+    Integer subAccount(@Param("account") OwnerAccount account, @Param("now")String now);
 
     @SelectProvider(type = OwnerAccountSqlProvider.class, method = "updateOwnerAccountForConfirm")
     Integer updateOwnerAccountForConfirm(OwnerAccount account);

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

@@ -38,7 +38,7 @@ public class OwnerAccountSqlProvider {
         return sql;
     }
 
-    public String addAccount(OwnerAccount account, LocalDateTime now) {
+    public String addAccount(@Param("account") OwnerAccount account, @Param("now")LocalDateTime now) {
         StringBuffer sqlList = new StringBuffer();
 
         sqlList.append("update owner_account set usable_balance = usable_balance +" +
@@ -51,7 +51,7 @@ public class OwnerAccountSqlProvider {
         return sqlList.toString();
     }
 
-    public String subAccount(OwnerAccount account, LocalDateTime now) {
+    public String subAccount(@Param("account") OwnerAccount account, @Param("now")LocalDateTime now) {
         StringBuffer sqlList = new StringBuffer();
 
         sqlList.append("update owner_account set usable_balance = usable_balance -" +

performance-web/src/test/java/com/clx/performance/JobTest.java

@@ -16,6 +16,8 @@ import com.clx.performance.enums.OrderGoodsTruckBindEnum;
 import com.clx.performance.mapper.OrderGoodsMapper;
 import com.clx.performance.model.OrderGoods;
 import com.clx.performance.model.OwnerAccount;
+import com.clx.performance.param.pc.OwnerCaseOutParam;
+import com.clx.performance.service.OwnerAccountService;
 import com.msl.common.base.Optional;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -58,12 +60,15 @@ public class JobTest {
     @Autowired
     private OwnerAccountDao ownerAccountDao;
 
+    @Autowired
+    private OwnerAccountService ownerAccountService;
+
     @Test
     public void test1() {
-        OwnerAccount account = new OwnerAccount();
-        account.setId(7);
-        account.setModifiedTime(LocalDateTime.now());
-        Integer i = ownerAccountDao.updateAccountCAS(account, LocalDateTime.now(), false);
-        System.out.println(i);
+        OwnerCaseOutParam param = new OwnerCaseOutParam();
+        param.setOwnerUserNo(1021181283626946629L);
+        param.setCaseOutBalance(new BigDecimal("1"));
+        param.setAccountType(1);
+        ownerAccountService.accountCaseOut(param);
     }
 }