处理BUG

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

@@ -37,8 +37,8 @@ public class OwnerRunningWaterRecordDaoImpl extends BaseDaoImpl<OwnerRunningWate
 
     @Override
     public List<OwnerRunningWaterRecord> getOwnerRunningWaterRecord(String orderNo) {
-        return baseMapper.selectList(lambdaQuery().eq(OwnerRunningWaterRecord::getOrderNo, orderNo)
-                .eq(OwnerRunningWaterRecord::getOrderChildNo, null)
+        return baseMapper.selectList(lQrWrapper().eq(OwnerRunningWaterRecord::getOrderNo, orderNo)
+                .isNull(OwnerRunningWaterRecord::getOrderChildNo)
         );
     }
 }

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

@@ -48,7 +48,7 @@ public interface OwnerAccountMapper extends BaseMapper<OwnerAccount> {
 
     @Update("update owner_account set usable_balance = usable_balance + #{account.usableBalance}"
             + ",account_balance = account_balance + #{account.accountBalance}"
-            + ",frozen_balance = frozen_balance - #{account.frozenBalance},"
+            + ",frozen_balance = frozen_balance - #{account.frozenBalance}"
             + ",modified_time= #{now}"
             + "where id = #{account.id} and modified_time = #{account.modifiedTime}"
     )

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

@@ -773,6 +773,7 @@ public class OwnerAccountServiceImpl implements OwnerAccountService {
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public void ownerAccountThaw(ThawAccountParam param) {
         String orderNo = param.getOrderNo();
         if (StringUtils.equals(param.getOrderType(), "1")) {

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

@@ -20,7 +20,7 @@ public class OwnerAccountSqlProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +
                     " a.owner_user_name, a.mobile, a.account_type, " +
-                    " a.account_balance,a.usable_balance, a.frozen_balance,a.create_by,a.create_time");
+                    " 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_account a");
 
 

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

@@ -10,7 +10,7 @@ public class OwnerBindCardRecordSqlProvider {
         String sql = new SQL() {{
             SELECT("a.id, a.owner_user_no," +
                     " a.owner_user_name, a.owner_bank, " +
-                    " a.bank_card_number,a.open_account_bank, a.account_bank_name,a.create_by,a.create_time,a.create_item");
+                    " a.bank_card_number,a.open_account_bank, a.account_bank_name,a.create_by,date_format(a.create_time, '%Y-%m-%d %H:%i:%s') as create_time,a.create_item");
             FROM("owner_bind_card_record a");
             WHERE("a.owner_user_no = #{param.ownerUserNo}");
 

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

@@ -22,6 +22,7 @@ import com.clx.performance.model.OwnerAccount;
 import com.clx.performance.model.OwnerCaseOut;
 import com.clx.performance.param.pc.OwnerCaseOutParam;
 import com.clx.performance.param.pc.owner.FrozenAccountParam;
+import com.clx.performance.param.pc.owner.ThawAccountParam;
 import com.clx.performance.service.OwnerAccountService;
 import com.msl.common.base.Optional;
 import com.msl.common.exception.ServiceSystemException;
@@ -76,14 +77,13 @@ public class JobTest {
     @Autowired
     private OwnerCaseOutDao ownerCaseOutDao;
 
+
+
     @Test
     public void test1() {
-        Optional<OwnerCaseOut> optional = ownerCaseOutDao.getEntityByKey(19);
-        OwnerCaseOut ownerCaseOut = optional.get();
-        BigDecimal caseOutBalance = ownerCaseOut.getCaseOutBalance();
-        BigDecimal platformPayBalance = ownerCaseOut.getPlatformPayBalance();
-        if (platformPayBalance.compareTo(caseOutBalance) != 0) {
-            throw new ServiceSystemException(PerformanceResultEnum.MONEY_NO_SAME);
-        }
+        ThawAccountParam param = new ThawAccountParam();
+        param.setOrderType("1");
+        param.setOrderNo("PT2023102500436");
+        ownerAccountService.ownerAccountThaw(param);
     }
 }