From 15f4ce8b4212e2512c2f9a2c020be8dd059d8159 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 24 Mar 2021 17:00:08 +0800
Subject: [PATCH] 分销设置自购返佣

---
 zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
index 37e9b50..6e0e965 100644
--- a/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
+++ b/zq-erp/src/main/java/com/matrix/system/fenxiao/service/ShopSalesmanApplyService.java
@@ -54,7 +54,7 @@
     ShopSalesmanGradeDao shopSalesmanGradeDao;
 
     @Autowired
-    private BizUserDao bizUserDao;
+    BizUserDao bizUserDao;
 
     @Autowired
     BizUserService bizUserService;
@@ -225,6 +225,7 @@
 		//修改USER的状态
 		bizUser.setParentOpenId(parentUserId);
 		bizUser.setBindingParentTime(new Date());
+        bizUser.setSalesmanGrade(shopSalesmanApply.getGradeId());
 		bizUserDao.updateByModel(bizUser);
 	}
 
@@ -371,6 +372,10 @@
         if(StrUtil.isEmpty(name)) {
         	return AjaxResult.buildFailInstance("请输入方案名称");
         }
+        Double selfCommission = updateFyfaDto.getSelfCommission();
+        if(ObjectUtil.isEmpty(selfCommission)) {
+            return AjaxResult.buildFailInstance("请输入正确的自购返佣");
+        }
         Double sealesCommission = updateFyfaDto.getSealesCommission();
         if(ObjectUtil.isEmpty(sealesCommission)) {
         	return AjaxResult.buildFailInstance("请输入正确的推广提成");
@@ -384,6 +389,7 @@
             ShopSalesmanGrade shopSalesmanGrade = new ShopSalesmanGrade();
             shopSalesmanGrade.setCompanyId(updateFyfaDto.getCompanyId());
             shopSalesmanGrade.setName(updateFyfaDto.getName());
+            shopSalesmanGrade.setSelfCommission(selfCommission);
             shopSalesmanGrade.setSealesCommission(sealesCommission);
             shopSalesmanGrade.setInvitationCommission(invitationCommission);
             shopSalesmanGrade.setGradeCondition(updateFyfaDto.getGradeCondition());
@@ -398,6 +404,7 @@
         }
         selectById.setCompanyId(updateFyfaDto.getCompanyId());
         selectById.setName(updateFyfaDto.getName());
+        selectById.setSelfCommission(selfCommission);
         selectById.setSealesCommission(sealesCommission);
         selectById.setInvitationCommission(invitationCommission);
         selectById.setGradeCondition(updateFyfaDto.getGradeCondition());

--
Gitblit v1.9.1