货主借款申请

performance-api/src/main/java/com/clx/performance/param/pc/loan/owner/OwnerLoanRecordParam.java

+package com.clx.performance.param.pc.loan.owner;
+
+import com.msl.common.convertor.type.MoneyInConvert;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+
+@Setter
+@Getter
+@ToString
+@NoArgsConstructor
+public class OwnerLoanRecordParam {
+
+    @ApiModelProperty(value = "借款金额", example = "张三")
+    @NotNull(message = "借款金额不能为空")
+    @MoneyInConvert
+    private BigDecimal loanBalance;
+
+    @ApiModelProperty(value = "借款方", example = "伟华煤炭运销公司")
+    @NotBlank(message = "借款方不能为空")
+    private String borrower;
+
+
+    @ApiModelProperty(value = "借出方", example = "诚联信网络科技有限公司")
+    @NotBlank(message = "借出方不能为空")
+    private String lendingParty;
+
+    @ApiModelProperty(value = "借出方账户", example = "诚联信银行账户")
+    @NotBlank(message = "借出方不能为空")
+    private String paymentAccount;
+
+    @ApiModelProperty(value = "借出时效（天）", example = "2")
+    @NotNull(message = "借出时效（天）不能为空")
+    private Integer expireDay;
+}

performance-web/src/main/java/com/clx/performance/controller/pc/loan/owner/OwnerLoanAccountController.java

 package com.clx.performance.controller.pc.loan.owner;
 
+import com.clx.performance.param.pc.loan.owner.OwnerLoanRecordParam;
 import com.clx.performance.service.loan.OwnerLoanAccountApproveService;
+import com.clx.performance.service.loan.OwnerLoanAccountRunningWaterRecordService;
+import com.clx.performance.service.loan.OwnerLoanRecordService;
 import com.msl.common.result.Result;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 
 @Slf4j
@@ -22,10 +23,20 @@ public class OwnerLoanAccountController {
 
     private final OwnerLoanAccountApproveService ownerLoanAccountApproveService;
 
+    private final OwnerLoanRecordService ownerLoanRecordService;
+
     @ApiOperation(value = "货主借款账户开通",notes = "<br>By:胡宇帆")
     @GetMapping("/openOwnerLoanAccount")
     public Result<Object> openOwnerLoanAccount() {
         ownerLoanAccountApproveService.openOwnerLoanAccountApprove();
         return Result.ok();
     }
+
+
+    @ApiOperation(value = "货主借款申请",notes = "<br>By:胡宇帆")
+    @PostMapping("/ownerLoanRecordSubmit")
+    public Result<Object> ownerLoanRecordSubmit(@RequestBody OwnerLoanRecordParam param) {
+        ownerLoanRecordService.ownerLoanRecordSubmit(param);
+        return Result.ok();
+    }
 }

performance-web/src/main/java/com/clx/performance/model/loan/OwnerLoanRecord.java

@@ -30,7 +30,7 @@ public class OwnerLoanRecord implements HasKey<Integer> {
 
     @TableField("owner_user_no")
     @ApiModelProperty("货主编码")
-    private String ownerUserNo;
+    private Long ownerUserNo;
 
     @TableField("owner_user_name")
     @ApiModelProperty("货主名称")

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

@@ -62,17 +62,15 @@ public class OwnerLoanAccountApproveServiceImpl  implements OwnerLoanAccountAppr
     @Transactional(rollbackFor = Exception.class)
     public void ownerLoanAccountApprove(OwnerLoanAccountApproveParam param) {
         Boolean status = param.getStatus();
-        if (status) {
-            //审批通过
         OwnerLoanAccountApprove entity = new OwnerLoanAccountApprove();
         entity.setId(param.getId());
+        if (status) {
+            //审批通过
             entity.setStatus(10);
             ownerLoanAccountApproveDao.updateEntityByKey(entity);
             ownerLoanAccountService.openOwnerLoanAccount(entity.getOwnerUserNo(), entity.getOwnerUserName(), entity.getMobile());
         } else {
             //审批拒绝
-            OwnerLoanAccountApprove entity = new OwnerLoanAccountApprove();
-            entity.setId(param.getId());
             entity.setStatus(20);
             entity.setRejectReason(param.getRejectReason());
             ownerLoanAccountApproveDao.updateEntityByKey(entity);

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

@@ -5,13 +5,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.clx.performance.dao.loan.OwnerLoanRecordDao;
 import com.clx.performance.model.loan.OwnerLoanRecord;
 import com.clx.performance.param.pc.loan.carrier.PageCarrierOwnerLoanRecordParam;
+import com.clx.performance.param.pc.loan.owner.OwnerLoanRecordParam;
 import com.clx.performance.service.loan.OwnerLoanRecordService;
 import com.clx.performance.struct.loan.OwnerLoanRecordStruct;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
+import com.msl.common.utils.LocalDateTimeUtils;
+import com.msl.user.data.UserSessionData;
+import com.msl.user.utils.TokenUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.util.List;
 
 /**
@@ -38,4 +44,25 @@ public class OwnerLoanRecordServiceImpl  implements OwnerLoanRecordService {
         returnPage.setRecords(records);
         return returnPage;
     }
+
+    @Override
+    public void ownerLoanRecordSubmit(OwnerLoanRecordParam param) {
+        UserSessionData loginUserInfo = TokenUtil.getLoginUserInfo();
+        OwnerLoanRecord entity = new OwnerLoanRecord();
+        LocalDateTime createTime = LocalDateTime.now();
+        LocalDateTime loanRepaymentTime = createTime.plusDays(param.getExpireDay());
+        entity.setLoanRepaymentTime(loanRepaymentTime);
+        entity.setCreateTime(createTime);
+        entity.setOwnerUserNo(loginUserInfo.getUserNo());
+        entity.setOwnerUserName(loginUserInfo.getUserName());
+        entity.setMobile(loginUserInfo.getUserMobile());
+        entity.setLoanBalance(param.getLoanBalance());
+        entity.setBorrower(param.getBorrower());
+        entity.setLendingParty(param.getLendingParty());
+        entity.setPayee("收款方写死");
+        entity.setPayeeAccount("收款方账户写死");
+        entity.setCreateBy(loginUserInfo.getUserName());
+        entity.setStatus(10);
+        ownerLoanRecordDao.saveEntity(entity);
+    }
 }

performance-web/src/main/java/com/clx/performance/service/loan/OwnerLoanRecordService.java

@@ -2,6 +2,7 @@ package com.clx.performance.service.loan;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.clx.performance.param.pc.loan.carrier.PageCarrierOwnerLoanRecordParam;
+import com.clx.performance.param.pc.loan.owner.OwnerLoanRecordParam;
 import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
 
 /**
@@ -11,4 +12,6 @@ import com.clx.performance.vo.pc.loan.carrier.OwnerLoanRecordVO;
  */
 public interface OwnerLoanRecordService {
     IPage<OwnerLoanRecordVO> pageOwnerLoanRecord(PageCarrierOwnerLoanRecordParam param);
+
+    void ownerLoanRecordSubmit(OwnerLoanRecordParam param);
 }