fix

zhongzheng-admin-saas/src/main/java/com/zhongzheng/controller/order/TopOrderStatisticsController.java

@@ -158,4 +158,10 @@ public class TopOrderStatisticsController extends BaseController {
     public AjaxResult<TopOrderStatisticsViewVo> getStatisticsBusinessView(TopOrderStatisticsViewBo bo) {
         return AjaxResult.success(iTopOldOrderService.getStatisticsBusinessView(bo));
     }
+
+    @ApiOperation("机构业务员列表")
+    @GetMapping("/tenantCreateList")
+    public AjaxResult<List<TopOrderStatisticsTwoVo>> getTenantCreateList(TopOrderStatisticsViewBo bo) {
+        return AjaxResult.success(iTopOldOrderService.getTenantCreateList(bo));
+    }
 }

zhongzheng-framework/src/main/java/com/zhongzheng/framework/web/service/UserServiceImpl.java

@@ -690,6 +690,12 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
         SnowflakeIdUtils idWorker = new SnowflakeIdUtils(3, 1);
         inertData.setUserAccount(String.valueOf(idWorker.nextId()));
         inertData.setSex(1);
+        if (ObjectUtils.isNotNull(bo.getEduLevel())){
+            inertData.setEduLevel(bo.getEduLevel());
+        }
+        if (ObjectUtils.isNotNull(bo.getSex())){
+            inertData.setSex(bo.getSex());
+        }
         if (ObjectUtils.isNotNull(bo.getIdcard())){
             inertData.setIdCard(bo.getIdcard());
         }
@@ -1008,6 +1014,17 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements IU
                 }else {
                     registerBo.setTel(bo.getTelphone());
                 }
+                if(Validator.isNotEmpty(bo.getSex())){
+                    if(bo.getSex().equals("男")){
+                        registerBo.setSex(1);
+                    }
+                    else if(bo.getSex().equals("女")){
+                        registerBo.setSex(2);
+                    }
+                }
+                if(Validator.isNotEmpty(bo.getEducation())){
+                    registerBo.setEduLevel(bo.getEducation());
+                }
                 registerBo.setIdcard(bo.getIdCard());
                 registerBo.setRegisterPlat("4");
                 Long userId = systemRegisterUser(registerBo);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/mapper/TopOldOrderMapper.java

@@ -107,4 +107,6 @@ public interface TopOldOrderMapper extends BaseMapper<TopOldOrder> {
 
     List<TopOrderStatisticsTwoVo> getStatisticsBusinessView(TopOrderStatisticsViewBo bo);
 
+    List<TopOrderStatisticsTwoVo> getTenantCreateList(TopOrderStatisticsViewBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/ITopOldOrderService.java

@@ -183,4 +183,6 @@ public interface ITopOldOrderService extends IService<TopOldOrder> {
 	TopOrderStatisticsViewVo getStatisticsTenantView(TopOrderStatisticsViewBo bo);
 
 	TopOrderStatisticsViewVo getStatisticsBusinessView(TopOrderStatisticsViewBo bo);
+
+	List<TopOrderStatisticsTwoVo> getTenantCreateList(TopOrderStatisticsViewBo bo);
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -3703,6 +3703,11 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         return viewVo;
     }
 
+    @Override
+    public List<TopOrderStatisticsTwoVo> getTenantCreateList(TopOrderStatisticsViewBo bo) {
+        return this.baseMapper.getTenantCreateList(bo);
+    }
+
     private List<Long> getDayTime(Long startTime,Long endTime){
         List<Long> tiemList = new ArrayList<>();
         Long zeroTime = DateUtils.getScheduleTimeZeroTime(startTime);

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/order/vo/TopOrderStatisticsTwoVo.java

@@ -32,5 +32,15 @@ public class TopOrderStatisticsTwoVo implements Serializable {
     @ApiModelProperty("订单金额")
     private BigDecimal money = BigDecimal.ZERO;
 
+    @ApiModelProperty("机构名称")
+    private String tenantName;
+
+    @ApiModelProperty("业务员名称")
+    private String createUsername;
+
+
+    @ApiModelProperty("业务员编号")
+    private String createNo;
+
 
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserIdCardAddBo.java

@@ -29,4 +29,8 @@ public class UserIdCardAddBo {
     /** 公司名称 */
     @ApiModelProperty("公司名称")
     private String companyName;
+    @ApiModelProperty("教育")
+    public String education;
+    @ApiModelProperty("性别")
+    public String sex;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserSystemRegisterBo.java

@@ -27,5 +27,7 @@ public class UserSystemRegisterBo {
     /** 公司名称 */
     @ApiModelProperty("公司名称")
     private String companyName;
+    private Integer sex;
+    private String eduLevel;
 
 }

zhongzheng-system/src/main/resources/mapper/modules/top/TopOldOrderMapper.xml

@@ -2022,6 +2022,8 @@
         COUNT(a.order_id) AS orderNum,
         SUM(a.money) AS money,
         any_value(a.timeStr) AS orderTime,
+        any_value(a.create_username) AS create_username,
+        any_value(a.tenant_name) AS tenant_name,
         <if test="viewSign != null and viewSign == 1">
             DATE_FORMAT(FROM_UNIXTIME(a.timeStr), '%Y-%m-%d') AS timeStr
         </if>
@@ -2035,9 +2037,11 @@
         SELECT
         too.order_id as order_id,
         too.check_time as timeStr,
-        too.order_received - too.order_refunded as money
+        too.order_received - too.order_refunded as money,
+        too.create_username,
+        st.tenant_name
         FROM
-        top_old_order too
+        top_old_order too  LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id
         WHERE
         too.`status` = 1
         AND too.check_status = 1
@@ -2057,9 +2061,12 @@
         SELECT
         o.order_id as order_id,
         o.create_time as timeStr,
-        o.order_price as money
+        o.order_price as money,
+        null as create_username,
+        st.tenant_name
         FROM
         `order` o
+        LEFT JOIN sys_tenant st ON o.tenant_id = st.tenant_id
         WHERE
         o.`status` = 1
         AND o.order_status = 1
@@ -2097,6 +2104,8 @@
         COUNT(a.order_sn) AS orderNum,
         SUM(a.money) AS money,
         any_value(a.timeStr) AS orderTime,
+        any_value(a.create_username) AS create_username,
+        any_value(a.tenant_name) AS tenant_name,
         <if test="viewSign != null and viewSign == 1">
             DATE_FORMAT(FROM_UNIXTIME(a.timeStr), '%Y-%m-%d') AS timeStr
         </if>
@@ -2122,9 +2131,12 @@
         )
         ) AS `business_name`,
         too.order_received - too.order_refunded AS money,
-        too.check_time as timeStr
+        too.check_time as timeStr,
+        too.create_username,
+        st.tenant_name
         FROM
         top_old_order too
+        LEFT JOIN sys_tenant st ON too.tenant_id = st.tenant_id
         WHERE
         too.`status` = 1
         AND too.check_status = 1
@@ -2145,11 +2157,14 @@
         `og`.`order_sn` AS `order_sn`,
         concat( `cet`.`education_name`, '-', `cb`.`business_name`, `cpt`.`project_name` ) AS `business_name`,
         og.goods_received as money,
-        og.create_time as timeStr
+        og.create_time as timeStr,
+        null as create_username,
+        st.tenant_name
         FROM
         ((((
         `order` o
         LEFT JOIN  `order_goods` `og` ON o.order_sn = og.order_sn
+        LEFT JOIN sys_tenant st ON o.tenant_id = st.tenant_id
         LEFT JOIN `goods` `g` ON ((
         `og`.`goods_id` = `g`.`goods_id`
         )))
@@ -2162,6 +2177,7 @@
         LEFT JOIN `course_business` `cb` ON ((
         `g`.`business_id` = `cb`.`id`
         )))
+
         WHERE
         og.pay_status != 1
         AND (
@@ -2197,4 +2213,22 @@
             GROUP BY DATE_FORMAT(FROM_UNIXTIME(a.timeStr), '%Y-%m')
         </if>
     </select>
+
+    <select id="getTenantCreateList" parameterType="com.zhongzheng.modules.top.order.bo.TopOrderStatisticsViewBo"
+            resultType="com.zhongzheng.modules.top.order.vo.TopOrderStatisticsTwoVo">
+        SELECT
+            create_no,
+            create_username
+        FROM
+            top_old_order
+        WHERE
+              1=1
+        <if test="tenantId != null and tenantId != ''">
+            AND tenant_id = #{tenantId}
+        </if>
+          AND create_no IS NOT NULL
+        GROUP BY
+            create_no,
+            create_username
+    </select>
 </mapper>