Merge branch 'master' of https://git.iwulin.tech/quyixiao/eb-service-api

a commit message to explain why this merge is necessary,

api-mapper/src/main/java/com/heyu/api/data/entity/vv/VvMySettlementEntity.java

@@ -1,12 +1,12 @@
 package com.heyu.api.data.entity.vv;
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
-import com.lz.mybatis.plugin.annotations.AS;
 
 import java.math.BigDecimal;
-import java.util.Date;import java.util.Date;
+import java.util.Date;
 /**
 *结算
 * @author quyixiao
@@ -15,7 +15,7 @@ import java.util.Date;import java.util.Date;
 
 @Data
 @TableName("vv_my_settlement")
-public class VvMySettlementEntity implements java.io.Serializable {
+public class VvMySettlementEntity  implements java.io.Serializable {
 private static final long serialVersionUID = 1L;
 
     public final static String CLASS_NAME ="com.heyu.api.data.entity.vv.VvMySettlementEntity:";

api-mapper/src/main/java/com/heyu/api/data/enums/MySettlementStatusEnums.java

@@ -6,7 +6,7 @@ package com.heyu.api.data.enums;
 public enum MySettlementStatusEnums {
     // apply_for_approval:同意审批，agree_approval: 同意审批 ,reject_approval：拒绝审批
     apply_for_approval("apply_for_approval", "申请审批"),
-    no_approval("no_approval", "不需要审批"),
+    no_approval("no_approval", "不需要审批,加钱的时候不需要审批"),
     agree_approval("agree_approval", "同意审批"),
     reject_approval("reject_approval", "拒绝审批");
 

api-third/src/main/java/com/heyu/api/alibaba/request/mm/order/VVMySettlementAddRequest.java

@@ -0,0 +1,23 @@
+package com.heyu.api.alibaba.request.mm.order;
+
+
+import com.heyu.api.data.entity.vv.VvMySettlementEntity;
+import lombok.Data;
+
+@Data
+public class VVMySettlementAddRequest extends VvMySettlementEntity {
+
+    /***
+     * 用户名
+     */
+    private String userName;
+
+    /***
+     *
+     */
+    private Long adminId;
+
+
+}
+
+

api-web/api-interface/src/main/java/com/heyu/api/controller/mm/AdminMySettlementController.java

@@ -3,6 +3,7 @@ package com.heyu.api.controller.mm;
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.heyu.api.alibaba.request.mm.order.VVMySettlementAddRequest;
 import com.heyu.api.alibaba.request.mm.order.VVMySettlementApprovalRequest;
 import com.heyu.api.alibaba.request.mm.order.VVMySettlementRequest;
 import com.heyu.api.alibaba.request.mm.order.resp.MyAccountDTO;
@@ -75,7 +76,9 @@ public class AdminMySettlementController {
      */
     @Describe("公款添加")
     @RequestMapping("/add")
-    public R add(@RequestBody VvMySettlementEntity vvMySettlementEntity) {
+    public R add(@RequestBody VVMySettlementAddRequest vvMySettlementEntity) {
+        String userName = vvMySettlementEntity.getUserName();
+        vvMySettlementEntity.setApplyUserName(userName);
         vvMySettlementEntity.setType(AccountTypeEnums.common.getType());
         if (AccountOperateEnums.plus.getSign().equals(vvMySettlementEntity.getOperate())) {
             VvMyAccountEntity vvMyAccountEntity = vvMyAccountDao.selectVvMyAccount(AccountTypeEnums.common.getType());
@@ -97,6 +100,7 @@ public class AdminMySettlementController {
         }
         vvMySettlementEntity.setCreateTimestamp(System.currentTimeMillis());
         vvMySettlementEntity.setModifyTimestamp(System.currentTimeMillis());
+
         vvMySettlementDao.insertVvMySettlement(vvMySettlementEntity);
 
         return R.ok().setData(vvMySettlementEntity);