个人提现列表

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/wallet/WithdrawalController.java

@@ -35,6 +35,13 @@ public class WithdrawalController extends BaseController {
         return withdrawalService.apply(applyWithdrawalVO, this.getUserLoginInfoFromRedis(request).getUserAccountId());
     }
 
+//    @ApiOperation(value = "个人提现明细列表-V1")
+//    @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserBillingDetailVO.class)})
+//    @PostMapping("withdrawalList")
+//    public ResultBody<UserBillingDetailVO> withdrawalList(HttpServletRequest request, @RequestBody WalletFlowQO walletFlowQO) {
+//        return withdrawalService.withdrawalList(this.getUserLoginInfoFromRedis(request).getUserAccountId(), walletFlowQO);
+//    }
+
     @ApiOperation(value = "个人提现明细列表")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = UserBillingDetailVO.class)})
     @PostMapping("withdrawalList")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/dao/wallet/PayWalletDao.java

@@ -34,7 +34,7 @@ public interface PayWalletDao {
 
     void insertWithdrawalLog(WithdrawalLogDO withdrawalLogDO);
 
-    List<WithdrawalLogDO> getWithdrawalListByUserAccountId(WalletFlowQO param);
+    List<XzWithdrawalApplyDO> getWithdrawalListByUserAccountId(WalletFlowQO param);
 
     XzWithdrawalApplyDO getWithdrawalApplyByIdOrOuterTradeNo(@Param(value = "id") Integer id, @Param(value = "outerTradeNo") String outerTradeNo);
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/impl/WithdrawalServiceImpl.java

@@ -137,9 +137,9 @@ public class WithdrawalServiceImpl implements WithdrawalService {
         }
         Integer pageNo = param.getPageNo();
         param.buildCurrentPage();
-        List<WithdrawalLogDO> withdrawalLogList = payWalletDao.getWithdrawalListByUserAccountId(param);
+        List<XzWithdrawalApplyDO> withdrawalLogList = payWalletDao.getWithdrawalListByUserAccountId(param);
         return ResultBody.success(PageResult.buildPage(pageNo, param.getPageSize(), count, withdrawalLogList.stream()
-                .map(WithdrawalLogDO::buildUserBillingDetailVO).collect(Collectors.toList())));
+                .map(XzWithdrawalApplyDO::buildUserBillingDetailVO).collect(Collectors.toList())));
     }
 
 

csm-service/cms-service-user/src/main/resources/mapper/wallet/PayWalletDao.xml

@@ -195,23 +195,45 @@
         WHERE pl.id = #{id}
     </select>
     <select id="getWithdrawalListByUserAccountId"
-            resultType="com.mmc.iuav.user.entity.wallet.WithdrawalLogDO">
+            resultType="com.mmc.iuav.user.entity.XzWithdrawalApplyDO">
         select id,
+        apply_status,
         user_account_id,
-        xz_withdrawal_apply_id,
-        pay_no,
-        pay_method,
-        pay_time,
-        salary_freeze,
+        bank_name,
+        bank_remo,
+        emp_num,
+        emp_name,
+        emp_phone,
+        license_id,
+        license_type,
+        `month`,
+        notify_url,
+        outer_trade_no,
+        pay_account,
+        pay_amount,
+        position_name,
+        remarks,
+        settle_type,
+        tax_fund_id,
+        wechat_app_id,
+        trade_status,
+        trade_time,
+        front_log_no,
+        trade_fail_code,
+        trade_result,
+        submit_status,
+        error_code,
+        error_message,
+        charge_amount,
         create_time
-        from withdrawal_log
+        from xz_withdrawal_apply
         <where>
             user_account_id = #{userAccountId}
             <if test="startTime != null and startTime != '' ">
-                and pc.pay_time &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d %H:%i:%s')
+                and create_time &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != '' ">
-                and pc.pay_time &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d %H:%i:%s')
+                and create_time &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d %H:%i:%s')
             </if>
         </where>
         order by create_time DESC
@@ -273,15 +295,15 @@
     </select>
     <select id="countPayWithdrawalLog" resultType="java.lang.Integer">
         select count(*)
-        from withdrawal_log
+        from xz_withdrawal_apply
         <where>
             user_account_id = #{userAccountId}
             <if test="startTime != null and startTime != '' ">
-                and pay_time &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d
+                and create_time &gt;= STR_TO_DATE(#{startTime},'%Y-%m-%d
                 %H:%i:%s')
             </if>
             <if test="endTime != null and endTime != '' ">
-                and pay_time &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d
+                and create_time &lt;= STR_TO_DATE(#{endTime},'%Y-%m-%d
                 %H:%i:%s')
             </if>
         </where>