提现

common/src/main/java/com/jpsoft/bus/modules/merchant/entity/WithdrawalRecord.java

@@ -52,7 +52,7 @@ public class WithdrawalRecord {
     @ApiModelProperty(value = "更新时间")
     private Date updateTime;
     @ApiModelProperty(value = "是否删除")
-    private Boolean delFlag;
+    private Boolean delFlag = false;
 
     @ApiModelProperty(value = "商户相关信息")
     private AccountInfo accountInfo;

web/src/main/java/com/jpsoft/bus/modules/mobile/controller/MerchantApiController.java

@@ -286,6 +286,7 @@ public class MerchantApiController {
             messageResult.setCode(200);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
+            messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
         }
@@ -366,6 +367,7 @@ public class MerchantApiController {
             messageResult.setCode(200);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
+            messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
         }
@@ -401,6 +403,7 @@ public class MerchantApiController {
             messageResult.setCode(200);
         } catch (Exception ex) {
             log.error(ex.getMessage(), ex);
+            messageResult.setCode(400);
             messageResult.setResult(false);
             messageResult.setMessage(ex.getMessage());
         }
@@ -471,7 +474,11 @@ public class MerchantApiController {
                     ProfitListDTO profitListDTO1 = new ProfitListDTO();
                     Date baseDate = DateUtil.offsetDay(startDate,-m);
                     Date baseStartDate = DateUtil.beginOfDay(baseDate);
-                    BigDecimal baseSum = orderInfoService.paySum(vehicleInfoList,payName,baseStartDate,baseDate,null);
+                    BigDecimal baseSum = BigDecimal.ZERO;
+                    if (vehicleInfoList.size()>0){
+                       baseSum  = orderInfoService.paySum(vehicleInfoList,payName,baseStartDate,baseDate,null);
+                    }
+
                     profitListDTO1.setDateDesc(DateUtil.format(baseDate,"yyyy-MM-dd"));
                     profitListDTO1.setRevenue(baseSum == null?BigDecimal.ZERO:baseSum);
                     list.add(profitListDTO1);
@@ -858,7 +865,7 @@ public class MerchantApiController {
     }
 
 
-    @PostMapping("withdrawal")
+    @PostMapping("withdrawalSubmit")
     @ApiOperation(value = "提现")
     public MessageResult<Map> withdrawal(String amount, String token, @RequestAttribute String subject) {
         MessageResult<Map> messageResult = new MessageResult<>();
@@ -884,9 +891,16 @@ public class MerchantApiController {
                 throw new Exception("提现金额不可超过可提现金额");
             }
 
-
-
-
+            WithdrawalRecord withdrawalRecord = new WithdrawalRecord();
+            withdrawalRecord.setId(UUID.randomUUID().toString());
+            withdrawalRecord.setMerchantId(accountInfo.getId());
+            withdrawalRecord.setApplyWithdrawalAmount(bigAmount);
+            withdrawalRecord.setApplyTime(new Date());
+            withdrawalRecord.setStatus("0");
+            withdrawalRecord.setWithdrawalNo(com.jpsoft.bus.modules.common.utils.StringUtils.getOutTradeNo());
+            withdrawalRecord.setCreateBy(accountInfo.getId());
+            withdrawalRecord.setCreateTime(new Date());
+            withdrawalRecordService.insert(withdrawalRecord);
 
             messageResult.setResult(true);
             messageResult.setCode(200);