修改用户redis储存内容，修改演出总数据计算，单票收入=单价*(总代票提+抽成票提）*数量

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/dto/SmileOrganizationVo.java

 package com.liquidnet.client.admin.zhengzai.smile.dto;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 /**
@@ -18,57 +19,68 @@ public class SmileOrganizationVo{
     /**
      * 组织名称
      */
+    @ApiModelProperty(value = "组织名称", example = "")
     private String name;
 
     /**
      * 省Id
      */
+    @ApiModelProperty(value = "省Id", example = "")
     private String provinceId;
 
     /**
      * 省
      */
+    @ApiModelProperty(value = "省", example = "")
     private String province;
 
     /**
      * 市Id
      */
+    @ApiModelProperty(value = "市Id", example = "")
     private String cityId;
 
     /**
      * 市
      */
+    @ApiModelProperty(value = "市", example = "")
     private String city;
 
     /**
      * 区Id
      */
+    @ApiModelProperty(value = "区Id", example = "")
     private String areaId;
 
     /**
      * 区
      */
+    @ApiModelProperty(value = "区", example = "")
     private String area;
 
     /**
      * 地区(省份/地区/详细地址)
      */
+    @ApiModelProperty(value = "地区(省份/地区/详细地址)", example = "")
     private String address;
 
     /**
      * 总代理
      */
+    @ApiModelProperty(value = "总代理", example = "")
     private String agentId;
 
     /**
      * 人数
      */
+    @ApiModelProperty(value = "人数", example = "")
     private Integer proper;
 
 
     /**
      * 0：删除，1正常
      */
+    @ApiModelProperty(value = "0：删除，1正常", example = "")
     private Integer delTag;
 
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileOrganizationServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageInfo;
 import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.common.utils.bean.BeanUtils;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrgAndUserVo;
 import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
@@ -72,7 +73,7 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
         log.info("smileOrganizationVo:{}", smileOrganizationVo);
         LambdaQueryWrapper<SmileOrganization> queryWrapper = Wrappers.lambdaQuery(SmileOrganization.class);
         queryWrapper.eq(SmileOrganization::getName, smileOrganizationVo.getName());
-        if (smileOrganizationMapper.selectOne(queryWrapper) == null) {
+        if (smileOrganizationMapper.selectOne(queryWrapper) == null && StringUtils.isNotEmpty(smileOrganizationVo.getAgentId())) {
             SmileOrganization smileOrganization = new SmileOrganization();
             BeanUtils.copyProperties(smileOrganizationVo, smileOrganization);
             smileOrganization.setCreatedDate(LocalDateTime.now());
@@ -81,14 +82,17 @@ public class SmileOrganizationServiceImpl extends ServiceImpl<SmileOrganizationM
             smileOrganizationMapper.insert(smileOrganization);
             return AjaxResult.success();
         }
-        return AjaxResult.warn("已添加");
+        return AjaxResult.warn("总代理不能为空或组织已添加");
     }
 
     @Override
     public AjaxResult update(SmileOrganization smileOrganization) {
-        smileOrganization.setUpdatedDate(LocalDateTime.now());
-        smileOrganizationMapper.updateById(smileOrganization);
-        return AjaxResult.success();
+        if (StringUtils.isNotEmpty(smileOrganization.getAgentId())){
+            smileOrganization.setUpdatedDate(LocalDateTime.now());
+            smileOrganizationMapper.updateById(smileOrganization);
+            return AjaxResult.success();
+        }
+       return AjaxResult.warn("总代理不能为空");
     }
 
     @Override

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileShowServiceImpl.java

@@ -220,9 +220,9 @@ public class SmileShowServiceImpl extends ServiceImpl<SmileSchoolMapper, SmileSc
                     int num = kylinOrderTicketAndAgentVo.getNumber() - kylinOrderTicketAndAgentVo.getRefundNumber();
                     if (num > 0) {
                         agentSaleNum+=num;
-                        //单价*票提*数量
+                        //单价*(总代票提+抽成票提）*数量
                         totalPrice = totalPrice.add(
-                                (ticketAndStatusDao.getPrice().multiply(kylinOrderTicketAndAgentVo.getAgentDistributions()))
+                                (ticketAndStatusDao.getPrice().multiply(kylinOrderTicketAndAgentVo.getAgentDistributions().add(kylinOrderTicketAndAgentVo.getAgentDistributionsMaster())))
                                         .multiply(BigDecimal.valueOf(num)));
                     }
                 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/smile/service/impl/SmileUserServiceImpl.java

@@ -173,7 +173,7 @@ public class SmileUserServiceImpl extends ServiceImpl<SmileUserMapper, SmileUser
                     smileUserCheckVo.getType(),
                     StringUtils.isEmpty(smileOrganization.getAgentId())?smileOrganization.getAgentId():smileUserCheckVo.getUid());
             //修改user代理 id 开启代理
-            smileUserMapper.updateUserByUid(smileUserCheckVo.getUid(), smileUserCheckVo.getOrgId(), smileUserCheckVo.getType());
+            smileUserMapper.updateUserByUid(smileUserCheckVo.getUid(), smileUserCheckVo.getOrgId(), smileUserCheckVo.getType(),smileOrganization.getAgentId());
         }
         return AjaxResult.success();
     }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/java/com/liquidnet/service/kylin/dao/KylinOrderTicketAndAgentVo.java

@@ -55,4 +55,14 @@ public class KylinOrderTicketAndAgentVo {
      */
     private BigDecimal agentDistributions;
 
+    /**
+     * 总代id
+     */
+    private BigDecimal agentIdMaster;
+
+    /**
+     * 总代抽成票提
+     */
+    private BigDecimal agentDistributionsMaster;
+
 }

liquidnet-bus-do/liquidnet-service-kylin-do/src/main/resources/com.liquidnet.service.kylin.mapper/KylinOrderTicketsMapper.xml

@@ -465,7 +465,9 @@
             kot.price_actual,
             kot.price_refund,
             kk.agent_id,
-            kk.agent_distributions
+            kk.agent_distributions,
+            kk.agent_id_master,
+            kk.agent_distributions_master
         FROM
             kylin_order_tickets AS kot
                 LEFT JOIN (
@@ -473,7 +475,9 @@
                     kotr.order_id,
                     kotr.agent_id,
                     kotr.performance_id,
-                    kotr.agent_distributions
+                    kotr.agent_distributions,
+                    kotr.agent_id_master,
+                    kotr.agent_distributions_master
                 FROM
                     kylin_order_ticket_relations AS kotr
                         LEFT JOIN kylin_order_ticket_status AS kots ON kotr.order_id = kots.order_id

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/entity/SmileUser.java

@@ -145,6 +145,11 @@ public class SmileUser implements Serializable {
      */
     private Integer agent;
 
+    /**
+     * 组织总代id
+     */
+    private String agentId;
+
     /**
      * 自我介绍
      */

liquidnet-bus-do/liquidnet-service-smile-do/src/main/java/com/liquidnet/service/smile/mapper/SmileUserMapper.java

@@ -32,7 +32,7 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> {
 
     List<Map> getUserOrder(String userId);
 
-    void updateUserByUid(@Param("uid") String uid,@Param("orgId") Long orgId,@Param("type")Integer tag);
+    void updateUserByUid(@Param("uid") String uid,@Param("orgId") Long orgId,@Param("type")Integer tag,@Param("agentId") String agentId);
 
     void updateUserStateById(@Param("uid") String uid,@Param("state") Integer state);
 
@@ -40,5 +40,5 @@ public interface SmileUserMapper extends BaseMapper<SmileUser> {
     int getCount();
     List<SmileUser> pageUser(@Param("offest") int offest,@Param("size") int size);
 
-    List<SmileUser> getAllUidByPerId(String performancesId);
+    List<SmileUser> getAllUidByPerId(@Param("performancesId") String performancesId);
 }

liquidnet-bus-do/liquidnet-service-smile-do/src/main/resources/com/liquidnet/service/smile/mapper/SmileUserMapper.xml

@@ -113,7 +113,9 @@
     <update id="updateUserByUid">
         update smile_user
         set org_id = #{orgId},
-            type   = #{type}
+            type   = #{type},
+            agent = 1,
+            agent_id = #{agentId}
         where uid = #{uid}
     </update>
 
@@ -129,6 +131,12 @@
     </update>
 
     <select id="getAllUidByPerId"  parameterType="java.util.Map" resultType="com.liquidnet.service.smile.entity.SmileUser">
-
+        SELECT
+            uid
+        FROM
+            smile_user su
+                LEFT JOIN kylin_order_ticket_relations AS kotr ON kotr.agent_id = su.uid
+        WHERE
+            kotr.performance_id = #{performancesId};
     </select>
 </mapper>