'1'

twzd-admin/src/test/java/com/miaxis/test/NormalTest.java

@@ -8,6 +8,7 @@ import com.miaxis.TwzdApplication;
 import com.miaxis.common.config.WxPayConfigImpl;
 import com.miaxis.common.config.WxpayConfig;
 import com.miaxis.common.utils.XmlUtil;
+import com.miaxis.extension.service.IWxExtensionIncomeService;
 import com.miaxis.question.mapper.QuestionInfoMapper;
 import com.miaxis.question.vo.QuestionInfoExcelTypeVo;
 import com.miaxis.question.vo.QuestionInfoExcelVo;
@@ -23,7 +24,10 @@ import org.springframework.test.context.ActiveProfiles;
 import org.springframework.test.context.junit4.SpringRunner;
 
 import javax.annotation.Resource;
-import java.io.*;
+import java.io.FileOutputStream;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.OutputStream;
 import java.util.List;
 import java.util.Map;
 import java.util.TreeMap;
@@ -43,6 +47,9 @@ public class NormalTest {
     @Autowired
     private WxpayConfig wxpayConfig;
 
+    @Autowired
+    IWxExtensionIncomeService wxExtensionIncomeService;
+
 
 
 
@@ -52,6 +59,12 @@ public class NormalTest {
 
     @Value("${app.appSecret}")
     private String secret;
+    @Test
+    public void test666() throws Exception {
+        wxExtensionIncomeService.addExtensionIncomeBySourceId(null,"ovKTX5-FKLF6_sgTtCIXpG_lz3PY",100);
+    }
+
+
     @Test
     public void getGzhToken() throws Exception {
         Map<String, String> sortMap = new TreeMap<String, String>();

twzd-service/src/main/java/com/miaxis/extension/service/impl/WxExtensionIncomeServiceImpl.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.miaxis.common.core.domain.entity.SysDictData;
 import com.miaxis.common.core.domain.entity.UserInfo;
+import com.miaxis.common.utils.StringUtils;
 import com.miaxis.extension.domain.WxExtensionIncome;
 import com.miaxis.extension.mapper.WxExtensionIncomeMapper;
 import com.miaxis.extension.service.IWxExtensionIncomeService;
@@ -13,6 +14,7 @@ import com.miaxis.spread.domain.WxSpreadRelation;
 import com.miaxis.spread.service.IWxSpreadRelationService;
 import com.miaxis.system.service.ISysDictDataService;
 import com.miaxis.system.service.ISysDictTypeService;
+import com.miaxis.system.service.ISysUserService;
 import com.miaxis.user.service.IUserInfoService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -43,6 +45,8 @@ public class WxExtensionIncomeServiceImpl extends ServiceImpl<WxExtensionIncomeM
 
     private final IUserInfoService userInfoService;
 
+    private final ISysUserService sysUserService;
+
     /**
      * 查询分成收益列表
      *
@@ -81,24 +85,35 @@ public class WxExtensionIncomeServiceImpl extends ServiceImpl<WxExtensionIncomeM
 
         List<UserInfo> userInfos = new ArrayList<>();
         dictDatas.forEach(d -> {
+            //给上级分发佣金和业绩
             if ("一级".equals(d.getDictLabel())){
-                //给上级分发佣金和业绩
                 UserInfo userInfo =  userInfoService.getOne(new QueryWrapper<UserInfo>().eq("openid",oneRelation.getParentOpenid()));
                 userInfo.setProfitPrice(userInfo.getProfitPrice()+(total*Integer.parseInt(d.getDictValue()))/100);
                 userInfo.setAchievement(userInfo.getAchievement()+total);
                 userInfos.add(userInfo);
             }
+            //给上级分发增加业绩
+            if ("驾校".equals(d.getDictLabel())){
+                UserInfo userInfo =  userInfoService.getOne(new QueryWrapper<UserInfo>().eq("openid",openid));
+                //如果该充值人员绑定了驾校
+                if (!StringUtils.isEmpty(userInfo.getSchoolName())){
+                    sysUserService.updateSysUserByNickName(userInfo.getSchoolName(),total);
+                }
+            }
 
-            List<UserInfo> upUserInfos = wxSpreadRelationService.getWxSpreadRelationList(oneRelation.getParentOpenid());
-            if (!upUserInfos.isEmpty()) {
-                upUserInfos.stream().forEach(userInfo -> {
-                    userInfo.setAchievement(userInfo.getAchievement() + total);
-                    userInfos.add(userInfo);
-                });
 
-            }
         });
 
+        //对二级以上的人业绩
+        List<UserInfo> upUserInfos = wxSpreadRelationService.getWxSpreadRelationList(oneRelation.getParentOpenid());
+        if (!upUserInfos.isEmpty()) {
+            upUserInfos.stream().forEach(userInfo -> {
+                userInfo.setAchievement(userInfo.getAchievement() + total);
+                userInfos.add(userInfo);
+            });
+
+        }
+
         //保存分成收益信息
         userInfoService.updateBatchById(userInfos);
     }

twzd-system/src/main/java/com/miaxis/system/mapper/SysUserMapper.java

@@ -121,4 +121,6 @@ public interface SysUserMapper
     void updateStudent(UserInfo userInfo);
 
     List<AgentVO> getAgentList(@Param("roleId")Long roleId, @Param("userName")String userName);
+
+    void updateSysUserByNickName(@Param("schoolName")String schoolName, @Param("total")Integer total);
 }

twzd-system/src/main/java/com/miaxis/system/service/ISysUserService.java

@@ -182,4 +182,6 @@ public interface ISysUserService
 
 
     List<AgentVO> getAgentList(Long roleId, String schoolName);
+
+    void updateSysUserByNickName(String schoolName, Integer total);
 }

twzd-system/src/main/java/com/miaxis/system/service/impl/SysUserServiceImpl.java

@@ -473,4 +473,9 @@ public class SysUserServiceImpl implements ISysUserService
     public List<AgentVO> getAgentList(Long roleId, String agentName) {
         return userMapper.getAgentList(roleId,agentName);
     }
+
+    @Override
+    public void updateSysUserByNickName(String schoolName, Integer total) {
+        userMapper.updateSysUserByNickName(schoolName,total);
+    }
 }

twzd-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -210,4 +210,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
 	</select>
 
+
+	<update id="updateSysUserByNickName">
+ 		update sys_user set achievement= achievement + #{total} where nick_name = #{schoolName}
+	</update>
+
 </mapper>