src/main/java/com/mzl/flower/dto/request/wallet/QueryWalletWithdrawDTO.java
@@ -37,6 +37,6 @@ private LocalDate approveEndDate; @ApiModelProperty(value = "提现状态") private String withdrawState; private String approveState; } src/main/java/com/mzl/flower/dto/response/wallet/WalletBillRecordVO.java
@@ -10,7 +10,7 @@ @Data public class WalletBillRecordVO extends AbstractTransDTO { private Long id; private String id; @ApiModelProperty(value = "供应商Id") private Long supplierId; src/main/java/com/mzl/flower/service/impl/wallet/WalletBillRecordServiceImpl.java
@@ -26,7 +26,6 @@ import com.mzl.flower.utils.ExcelExportUtil; import org.redisson.api.RLock; import org.redisson.api.RedissonClient; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.util.ObjectUtils; @@ -121,6 +120,7 @@ if (StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) { WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletBillRecordDO.getWithdrawRecordId()); withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.SUCCESS.name()); walletBillRecordDO.setRemark("账户资金提现完成"); walletWithdrawRecordMapper.updateById(withdrawRecordDO); } @@ -151,6 +151,7 @@ if (StringUtils.isEmpty(walletBillRecordDO.getWithdrawRecordId())) { WalletWithdrawRecordDO withdrawRecordDO = walletWithdrawRecordMapper.selectById(walletBillRecordDO.getWithdrawRecordId()); withdrawRecordDO.setWithdrawState(Constants.WALLET_WITHDRAW_STATE.FAILURE.name()); walletBillRecordDO.setRemark("账户资金提现失败"); walletWithdrawRecordMapper.updateById(withdrawRecordDO); } } src/main/java/com/mzl/flower/service/impl/wallet/WalletWithdrawRecordServiceImpl.java
@@ -244,6 +244,7 @@ } //记录转账状态，定时任务定时获取状态并更新钱包交易记录表信息 walletBillRecordDO.setRemark("账户资金提现中"); walletBillRecordMapper.insert(walletBillRecordDO); //不需要更新结算单了，此时提现的金额和计算单上的金额不一致 } src/main/resources/mapper/wallet/WalletBillRecordMapper.xml
@@ -38,7 +38,7 @@ </select> <select id="queryPage" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO"> select t.* ,s.name supplierName from t_wallet_bill_record t select t.* ,s.name supplierName ,w.approve_time as approveTime from t_wallet_bill_record t left join t_supplier_info s on t.supplier_id = s.id left join t_wallet_withdraw_record w on t.withdraw_record_id = w.id where t.deleted= 0 @@ -49,37 +49,28 @@ and t.supplier_id = #{dto.supplierId} </if> <if test="dto.type != null and dto.type != ''"> and t.type = #{type} and t.type = #{dto.type} </if> <if test="dto.orderNo != null and dto.orderNo != ''"> and torder_no = like concat('%', #{orderNo}, '%') and t.order_no like concat('%', #{dto.orderNo}, '%') </if> <if test="dto.createStartDate!=null "> <![CDATA[. AND w.create_time >= #{dto.createStartDate} ]]> AND DATE_FORMAT(w.create_time, '%Y-%m-%d') >= #{dto.createStartDate} </if> <if test="dto.endEndDate!=null "> <![CDATA[ AND w.create_time <= #{dto.endEndDate} ]]> AND DATE_FORMAT(w.create_time, '%Y-%m-%d') <= #{dto.endEndDate} </if> <if test="dto.approveStartDate!=null "> <![CDATA[ AND w.approve_time >= #{dto.approveStartDate} ]]> AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') >= #{dto.approveStartDate} </if> <if test="dto.approveEndDate!=null "> <![CDATA[ AND w.approve_time <= #{dto.approveStartDate} ]]> AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') <= #{dto.approveEndDate} </if> order by t.create_time </select> <select id="queryWalletBillRecordList" resultType="com.mzl.flower.dto.response.wallet.WalletBillRecordVO"> select t.* ,s.name supplierName from t_wallet_bill_record t select t.* , s.name supplierName, w.approve_time as approveTime from t_wallet_bill_record t left join t_supplier_info s on t.supplier_id = s.id left join t_wallet_withdraw_record w on t.withdraw_record_id = w.id where t.deleted= 0 @@ -90,32 +81,23 @@ and t.supplier_id = #{dto.supplierId} </if> <if test="dto.type != null and dto.type != ''"> and t.type = #{type} and t.type = #{dto.type} </if> <if test="dto.orderNo != null and dto.orderNo != ''"> and t.order_no = like concat('%', #{orderNo}, '%') and t.order_no like concat('%', #{dto.orderNo}, '%') </if> <if test="dto.createStartDate!=null "> <![CDATA[ AND w.create_time >= #{dto.createStartDate} ]]> AND DATE_FORMAT(w.create_time, '%Y-%m-%d') >= #{dto.createStartDate} </if> <if test="dto.endEndDate!=null "> <![CDATA[ AND w.create_time <= #{dto.endEndDate} ]]> AND DATE_FORMAT(w.create_time, '%Y-%m-%d') <= #{dto.endEndDate} </if> <if test="dto.approveStartDate!=null "> <![CDATA[ AND w.approve_time >= #{dto.approveStartDate} ]]> AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') >= #{dto.approveStartDate} </if> <if test="dto.approveEndDate!=null "> <![CDATA[ AND w.approve_time <= #{dto.approveStartDate} ]]> AND DATE_FORMAT(w.approve_time, '%Y-%m-%d') <= #{dto.approveEndDate} </if> order by t.create_time </select> </mapper> src/main/resources/mapper/wallet/WalletWithdrawRecordMapper.xml
@@ -30,31 +30,23 @@ <if test="dto.supplierId != null and dto.supplierId != ''"> and t.supplier_id = #{dto.supplierId} </if> <if test="dto.withdrawState != null and dto.withdrawState != ''"> and t.withdraw_state = #{dto.withdrawState} <if test="dto.approveState != null and dto.approveState != ''"> and t.approve_state = #{dto.approveState} </if> <if test="dto.createStartDate!=null "> <![CDATA[ AND DATE_FORMAT(t.create_time, '%Y-%m-%d') >= #{dto.createStartDate} ]]> </if> <if test="dto.endEndDate!=null "> <![CDATA[ AND DATE_FORMAT(t.create_time, '%Y-%m-%d') <= #{dto.endEndDate} ]]> </if> <if test="dto.approveStartDate!=null "> <![CDATA[ AND t.approve_time >= #{dto.approveStartDate} ]]> AND DATE_FORMAT(t.approve_time, '%Y-%m-%d') >= #{dto.approveStartDate} </if> <if test="dto.approveEndDate!=null "> <![CDATA[ AND t.approve_time <= #{dto.approveStartDate} ]]> AND DATE_FORMAT(t.approve_time, '%Y-%m-%d') <= #{dto.approveEndDate} </if> order by t.create_time order by t.create_time desc </select> </mapper>
