Merge branch 'master' into hjc_goblin_pos

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/param/PerformanceAdminListParam.java

@@ -9,6 +9,8 @@ import java.time.format.DateTimeFormatter;
 
 @Data
 public class PerformanceAdminListParam {
+    @ApiModelProperty(value = "演出ID", example = "")
+    private String performancesId;
     @ApiModelProperty(value = "演出名称", example = "")
     private String title;
     @ApiModelProperty(value = "-2全部状态:-1删除;0未提交;1审核中;2审核中（自动上线）;3审核通过;4审核未通过;6上线;7下架;8活动结束;9活动取消退款中;10活动取消退", example = "-2")

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/KylinAgentVo.java

+package com.liquidnet.service.kylin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+@Data
+public class KylinAgentVo implements Serializable, Cloneable {
+    @ApiModelProperty(value = "代理类型（1：总代，2：普代）")
+    private int identity;
+    @ApiModelProperty(value = "0-正常|1-黑名单")
+    private int isBlack;
+    @ApiModelProperty(value = "票提")
+    private BigDecimal carry;
+    @ApiModelProperty(value = "抽成票提")
+    private BigDecimal exCarry;
+
+    @ApiModelProperty(value = "代理id")
+    private String agentId;
+    @ApiModelProperty(value = "总代id")
+    private String agentMasterId;
+
+
+    private static final KylinAgentVo obj = new KylinAgentVo();
+
+    public static KylinAgentVo getNew() {
+        try {
+            return (KylinAgentVo) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new KylinAgentVo();
+        }
+    }
+}

liquidnet-bus-api/liquidnet-service-kylin-api/src/main/java/com/liquidnet/service/kylin/dto/vo/mongo/KylinOrderTicketVo.java

@@ -111,6 +111,12 @@ public class KylinOrderTicketVo implements Serializable, Cloneable {
     private String ticketId;
     @ApiModelProperty(position = 15, value = "代理id")
     private String agentId;
+
+//    @ApiModelProperty(position = 15, value = "代理状态[1-开启|2-关闭]")
+//    private int agentStatus;
+//    @ApiModelProperty(position = 15, value = "票提")
+//    private BigDecimal agentDistributions;
+
     @ApiModelProperty(position = 15, value = "是否会员")
     private Integer isMember;
     @ApiModelProperty(position = 15, value = "订单过期日期")

liquidnet-bus-api/liquidnet-service-smile-api/pom.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>liquidnet-bus-api</artifactId>
+        <groupId>com.liquidnet</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liquidnet-service-smile-api</artifactId>
+
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+    </properties>
+
+    <dependencies>
+        <!--<dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-smile-do</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>-->
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-kylin-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/constant/SmileRedisConst.java

+package com.liquidnet.service.goblin.constant;
+
+public class SmileRedisConst {
+    public static final String PREFIX = "smile:";
+
+    public static final String SMILE_USER = PREFIX.concat("user");  //用户key
+    public static final String SMILE_USER_VALIDATE = PREFIX.concat("user:validate");  //用户key
+
+    public static final String SMILE_SCHOOL = PREFIX.concat("school");  //校园key
+
+    public static final String SMILE_SHOW = PREFIX.concat("show");  //演出key
+
+    public static final String SMILE_AGENT = PREFIX.concat("agent:"); //代理:演出id：票种id
+
+    public static final String SELL_DATA = PREFIX.concat("sellData:");  //销售数据 第一步
+
+    public static final String SELL_DATA_DETAIL = PREFIX.concat("sellDataDetail:");  //销售数据 第一步
+
+    public static final String SELL_DATA_COMMISSION = PREFIX.concat("sellDataCommission:");  //销售数据 第一步
+    public static final String SELL_SHOW_PAYMENT = PREFIX.concat("show:payment:");  //打款信息  SELL_SHOW_PAYMENT+演出id+uid
+
+    public static final String SELL_USER_REVENUE = PREFIX.concat("user:revenue:");  //用户总营收  SELL_USER_REVENUE+uid
+
+    public static final String SELL_TEST = PREFIX.concat("test");  //用户总营收  SELL_USER_REVENUE+uid
+
+    public static final String SELL_SHOW_POEN = PREFIX.concat("show:poen:");  //代理总销售数量
+
+    public static final String SELL_SHOW_TOTAL_SALE_PRICE = PREFIX.concat("show:total:sale:price:");  //代理总销售金额  TotalSalePrice
+
+    public static final String SELL_SHOW_TOTAL_SALE_PRICE_USER = PREFIX.concat("show:total:sale:price:user:");  //用户销售总销售金额
+
+}

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/CommissionVO.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2022-03-11
+ */
+@ApiModel(value = "SellDataOneVO", description = "销量数据")
+@Data
+public class CommissionVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "title:演出名,performanceId:演出id，commiss:佣金,status:(1、待入账（项目未结束）2、演出已结束（可结算）3、已结算（已完成）)")
+    private List<Map> list;
+    @ApiModelProperty(value = "可结算")
+    private BigDecimal keJieSuan;
+    @ApiModelProperty(value = "待入账")
+    private BigDecimal daiRuZhang;
+    @ApiModelProperty(value = "总营收")
+    private BigDecimal zongYingShou;
+    private static final CommissionVO obj = new CommissionVO();
+
+    public BigDecimal getKeJieSuan() {
+        return keJieSuan==null?BigDecimal.ZERO:keJieSuan;
+    }
+
+    public BigDecimal getDaiRuZhang() {
+        return daiRuZhang==null?BigDecimal.ZERO:daiRuZhang;
+    }
+
+    public BigDecimal getZongYingShou() {
+        return zongYingShou==null?BigDecimal.ZERO:zongYingShou;
+    }
+
+    public static CommissionVO getNew() {
+        try {
+            return (CommissionVO) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new CommissionVO();
+        }
+    }
+
+
+
+
+}

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/OrderListVO.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2022-03-11
+ */
+@ApiModel(value = "SellDataOneVO", description = "销量数据")
+@Data
+public class OrderListVO implements Serializable {
+
+
+    @ApiModelProperty(value = "活动名字")
+    private  String activeName;
+    @ApiModelProperty(value = "票名字")
+    private String ticketName;
+    @ApiModelProperty(value = "数量")
+    private  int number;
+    @ApiModelProperty(value = "订单编号")
+    private String orderId;
+    @ApiModelProperty(value = "用户手机号")
+    private String phone;
+    @ApiModelProperty(value = "购买时间")
+    private String buyTime;
+
+    private static final OrderListVO obj = new OrderListVO();
+
+    public static OrderListVO getNew() {
+        try {
+            return (OrderListVO) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new OrderListVO();
+        }
+    }
+
+
+
+
+}

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SellDataOneVO.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2022-03-11
+ */
+@ApiModel(value = "SellDataOneVO", description = "销量数据")
+@Data
+public class SellDataOneVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+    @ApiModelProperty(value = "票名")
+    private String ticketName;
+    @ApiModelProperty(value = "数量")
+    private int ticketNumber;
+    @ApiModelProperty(value = "总金额")
+    private BigDecimal sellPrice;
+    @ApiModelProperty(value = "票提")
+    private BigDecimal piaoTi;
+    @ApiModelProperty(value = "佣金")
+    private BigDecimal commission;
+    @ApiModelProperty(value = "票id")
+    private String ticketId;
+    @ApiModelProperty(value = "抽成总佣金")
+    private BigDecimal chouChengCommission;
+
+
+    private static final SellDataOneVO obj = new SellDataOneVO();
+
+    public static SellDataOneVO getNew() {
+        try {
+            return (SellDataOneVO) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SellDataOneVO();
+        }
+    }
+
+
+
+
+}

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileAgentVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-16
+ */
+@Data
+public class SmileAgentVo {
+
+    private Long id;
+
+    /**
+     * 演出id
+     */
+    private String performanceId;
+
+    /**
+     * 票id
+     */
+    private String ticketId;
+
+    /**
+     * 票种
+     */
+    private String ticketType;
+
+    /**
+     * 总代票提
+     */
+    @ApiModelProperty(value = "总代票提")
+    private BigDecimal totalCarry;
+
+    /**
+     * 普代票提
+     */
+    @ApiModelProperty(value = "普代票提")
+    private BigDecimal ordCarry;
+
+
+}

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileSchoolVo.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-14
+ */
+@Data
+public class SmileSchoolVo implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 学校名称
+     */
+    @ApiModelProperty(value = "学校名称")
+    private String name;
+
+    /**
+     * 地址（省份-地区-详细地址）
+     */
+    @ApiModelProperty(value = "地址（省份-地区-详细地址）")
+    private String address;
+
+    /**
+     * 省key
+     */
+    @ApiModelProperty(value = "省key")
+    private String provinceKey;
+
+    /**
+     * 省
+     */
+    @ApiModelProperty(value = "省")
+    private String province;
+
+    /**
+     * 市key
+     */
+    @ApiModelProperty(value = "市key")
+    private String cityKey;
+
+    /**
+     * 市
+     */
+    @ApiModelProperty(value = "市")
+    private String city;
+
+    /**
+     * 区key
+     */
+    @ApiModelProperty(value = "区key")
+    private String areaKey;
+
+    /**
+     * 区
+     */
+    @ApiModelProperty(value = "区")
+    private String area;
+
+
+}

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileSellDataDetailVO.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2022-03-11
+ */
+@ApiModel(value = "SellDataOneVO", description = "销量数据")
+@Data
+public class SmileSellDataDetailVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+  /*  @ApiModelProperty(value = "订单id")
+    private String orderId;
+    @ApiModelProperty(value = "数量")
+    private String number   ;
+    @ApiModelProperty(value = "电话")
+    private String mobile;
+    @ApiModelProperty(value = "订单时间")
+    private String createAt;
+    private String dataId;*/
+
+    private String  ticketName;
+    @ApiModelProperty(value = "活动名字")
+    private String activeName;
+    @ApiModelProperty(value = "票的总量")
+    private int count;
+    @ApiModelProperty(value = "orderId:订单id,number:数量，mobile：电话，createAt：订单时间")
+    List<Map> list;
+    private String dataId;
+
+    //private String
+    private static final SmileSellDataDetailVO obj = new SmileSellDataDetailVO();
+
+    public static SmileSellDataDetailVO getNew() {
+        try {
+            return (SmileSellDataDetailVO) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SmileSellDataDetailVO();
+        }
+    }
+
+
+
+
+}

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileSellDataVO.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDateTime;
+import java.util.List;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2022-03-11
+ */
+@ApiModel(value = "SellDataOneVO", description = "销量数据")
+@Data
+public class SmileSellDataVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "活动名字")
+    private  String activeName;
+    @ApiModelProperty(value = "id(用户+活动id)")
+    private  String sellDataId;
+    @ApiModelProperty(value = "销售具体情况")
+    List<SellDataOneVO> sellDataOneVO;
+    @ApiModelProperty(value = "销售总金额")
+    private BigDecimal sellAmount;
+    @ApiModelProperty(value = "销售总数量")
+    private BigDecimal sellNumber;
+    @ApiModelProperty(value = "销售总佣金")
+    private BigDecimal totalCommission;
+
+    @ApiModelProperty(value = "更新时间")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_FULL_STR)
+    private LocalDateTime updateTime;
+
+    private int deltag;
+
+    private static final SmileSellDataVO obj = new SmileSellDataVO();
+
+    public static SmileSellDataVO getNew() {
+        try {
+            return (SmileSellDataVO) obj.clone();
+        } catch (CloneNotSupportedException e) {
+            return new SmileSellDataVO();
+        }
+    }
+
+    public static void main(String[] args) {
+         String s="?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,0,?,?,?,?";
+        System.out.println(s.split(",").length);
+        String s1="img,`name`,`uid`,birthday,sex,phone,province_id,province,city_id,city,area_id,area,address,wechat,`type`,org_id,id_card,school_name,school_major,`identity`,tag,agent,error_reason,introduce,specialty1,specialty2,specialty3,`state`,del_tag,created_date,updated_date,school_id";
+        System.out.println(s1.split(",").length);
+    }
+
+
+}

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/dto/vo/SmileUserVO.java

+package com.liquidnet.service.goblin.dto.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import javax.validation.constraints.Positive;
+import java.io.Serializable;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author jobob
+ * @since 2022-03-11
+ */
+@ApiModel(value = "smileUser", description = "smile的user")
+@Data
+public class SmileUserVO implements Serializable {
+
+    public interface saveOne{}
+    public interface saveTwo{}
+    public interface saveThree{}
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+    @ApiModelProperty(value = "用户id")
+    private String uid;
+
+    @ApiModelProperty(value = "总代理id，如果总代理是其本身则是本uid，如果不是则是上级uid")
+    private String agentId;
+
+    /**
+     * 照片
+     */
+    @ApiModelProperty(value = "照片")
+    @NotBlank(groups = {saveOne.class},message = "照片必传")
+    private String img;
+
+    /**
+     * 真实姓名
+     */
+    @ApiModelProperty(value = "真实姓名")
+    @NotBlank(groups = {saveOne.class},message = "真实姓名必传")
+    private String name;
+
+    /**
+     * 生日YYYY-MM-DD
+     */
+    @ApiModelProperty(value = "生日(yyyy-MM-dd)")
+    @JsonFormat(shape=JsonFormat.Shape.STRING, pattern= DateUtil.DATE_SMALL_STR)
+    //@Past(groups = {saveOne.class},message = "生日必传")
+    @NotNull(groups = {saveOne.class},message = "生日必传")
+    private LocalDate birthday;
+
+    /**
+     * 性别(1：男（默认），2：女)
+     */
+    @ApiModelProperty(value = "性别(1：男（默认），2：女)")
+    @Positive(groups = {saveOne.class},message = "性别必传")
+    private Integer sex;
+
+    /**
+     * 手机号
+     */
+    @ApiModelProperty(value = "手机号")
+    @NotBlank(groups = {saveOne.class},message = "手机必传")
+    private String phone;
+
+    /**
+     * 省key
+     */
+    @ApiModelProperty(value = "省key")
+    @NotBlank(groups = {saveOne.class},message = "省必传")
+    private String provinceId;
+
+    /**
+     * 省
+     */
+    @ApiModelProperty(value = "省")
+    @NotBlank(groups = {saveOne.class},message = "省必传")
+    private String province;
+
+    /**
+     * 市key
+     */
+    @ApiModelProperty(value = "市key")
+    @NotBlank(groups = {saveOne.class},message = "市必传")
+    private String cityId;
+
+    /**
+     * 市
+     */
+    @ApiModelProperty(value = "市")
+    @NotBlank(groups = {saveOne.class},message = "市必传")
+    private String city;
+
+    /**
+     * 区key
+     */
+    @ApiModelProperty(value = "区key")
+    @NotBlank(groups = {saveOne.class},message = "区必传")
+    private String areaId;
+
+    /**
+     * 区
+     */
+    @ApiModelProperty(value = "区")
+    @NotBlank(groups = {saveOne.class},message = "区必传")
+    private String area;
+
+    /**
+     * 详细地址
+     */
+    @ApiModelProperty(value = "详细地址")
+   /* @NotBlank(groups = {saveOne.class},message = "详细地址必传")*/
+    private String address;
+
+    /**
+     * 微信号
+     */
+    @ApiModelProperty(value = "微信号")
+    @NotBlank(groups = {saveOne.class},message = "微信号必传")
+    private String wechat;
+
+    /**
+     *
+     */
+    @ApiModelProperty(value = "代理类型（0：未审核，1：总代，2：普代，3：未认证4：驳回审核）")
+    private Integer type;
+
+    /**
+     * 组织关联
+     */
+    @ApiModelProperty(value = "组织关联")
+    private Long orgId;
+
+    /**
+     * 身份证号
+     */
+    @ApiModelProperty(value = "身份证号")
+    @NotBlank(groups = {saveTwo.class},message = "身份证号必传")
+    private String idCard;
+
+    /**
+     * 学校名称
+     */
+    @ApiModelProperty(value = "学校名称")
+    @NotBlank(groups = {saveOne.class},message = "学校名称必传")
+    private String schoolName;
+
+    /**
+     * 专业
+     */
+    @ApiModelProperty(value = "专业")
+    @NotBlank(groups = {saveOne.class},message = "专业必传")
+    private String schoolMajor;
+
+    /**
+     * 身份（1:在校学生（默认），2已毕业）
+     */
+    @ApiModelProperty(value = "身份（1:在校学生（默认），2已毕业）")
+    @Positive(groups = {saveOne.class},message = "身份必传")
+    private Integer identity;
+
+    /**
+     * 标识步骤
+     */
+    @ApiModelProperty(value = "标识步骤")
+    private String tag;
+
+    /**
+     * 1：代理开启，2：代理关闭
+     */
+    @ApiModelProperty(value = "1：代理开启，2：代理关闭")
+    private Integer agent;
+
+    /**
+     * 自我介绍
+     */
+    @ApiModelProperty(value = "自我介绍")
+    @NotBlank(groups = {saveThree.class},message = "自我介绍必传")
+    private String introduce;
+
+    /**
+     * 擅长1
+     */
+    @ApiModelProperty(value = "擅长1")
+    private String specialty1;
+
+    /**
+     * 擅长2
+     */
+    @ApiModelProperty(value = "擅长2")
+    private String specialty2;
+
+    /**
+     * 擅长3
+     */
+    @ApiModelProperty(value = "擅长3")
+    private String specialty3;
+
+    /**
+     * 正常/黑名单
+     */
+    @ApiModelProperty(value = "0正常、1黑名单")
+    private Integer state;
+
+    /**
+     * 0：删除，1正常
+     */
+    @ApiModelProperty(value = "0-未删除|1-删除]")
+    private Integer delTag;
+    /**
+     * 认证标识
+     *//*
+    @ApiModelProperty(value = "（0:未审核，1：通过，2：未通过）")
+    private Integer authTag;*/
+
+    /**
+     * 认证失败原因
+     */
+    @ApiModelProperty(value = "认证失败原因")
+    private String errorReason;
+
+    @ApiModelProperty(value = "学校id")
+    private String schoolId;
+
+    @ApiModelProperty(value = "票提信息")
+    SmileAgentVo smileAgentVo;
+
+    private LocalDateTime createdDate;
+
+    private LocalDateTime updatedDate;
+
+    private  int authStatus;
+
+
+}

liquidnet-bus-api/liquidnet-service-smile-api/src/main/java/com/liquidnet/service/goblin/service/manage/SmileFrontService.java

+package com.liquidnet.service.goblin.service.manage;
+
+import com.liquidnet.service.goblin.dto.vo.SmileSellDataDetailVO;
+import com.liquidnet.service.goblin.dto.vo.SmileUserVO;
+import com.liquidnet.service.kylin.dto.vo.mongo.KylinPerformanceVo;
+
+import java.util.List;
+
+public interface SmileFrontService {
+
+    public boolean saveOrUpdateUser(SmileUserVO smileUserVO,SmileUserVO redisVo,String type);
+    public List<KylinPerformanceVo>  getPerformance();
+    public void deleteUser(String uid);
+    public boolean auth(String uid,SmileUserVO redisVo);
+    public SmileSellDataDetailVO getSellDataDetail(String agentId, String ticketId, String activeName, String ticketName);
+}

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/vo/SweetAppletUsersVo.java

@@ -46,7 +46,7 @@ public class SweetAppletUsersVo implements Serializable, Cloneable {
     private String countryCode;
 
     /**
-     * 1草莓 2五百里 3mdsk 4正在 5跳飞船音乐节
+     *  1草莓 2五百里 3mdsk 4正在 5跳飞船音乐节 6小家伙
      */
     private Integer type;
 

liquidnet-bus-api/pom.xml

@@ -23,6 +23,7 @@
         <module>liquidnet-service-slime-api</module>
         <module>liquidnet-service-stone-api</module>
         <module>liquidnet-service-goblin-api</module>
+        <module>liquidnet-service-smile-api</module>
     </modules>
     <dependencies>
         <dependency>

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/LocalAdminController.java

@@ -18,10 +18,52 @@ public class LocalAdminController extends BaseController
 {
     private final String stonePrefix = "zhengzai/stone";
     private final String storePrefix = "zhengzai/store";
+    private final String smilePrefix = "zhengzai/smile";
 
     @Value("${liquidnet.client.admin.platformUrl}")
     private String platformUrl;
 
+    // 小家伙路由开始
+    @GetMapping("/smileList") // 用户列表
+    public String smileList()
+    {
+        return smilePrefix + "/userList/list";
+    }
+    @GetMapping("/smileDetail") // 用户详情
+    public String smileDetail()
+    {
+        return smilePrefix + "/userList/detail";
+    }
+
+    @GetMapping("/smilePending") // 待审核列表
+    public String smilePending()
+    {
+        return smilePrefix + "/userPendingList/list";
+    }
+    @GetMapping("/smilePendingDetail") // 待审核详情
+    public String smilePendingDetail() { return smilePrefix + "/userPendingList/detail"; }
+
+    @GetMapping("/smileTicketsList") // 演出列表
+    public String smileTicketsList()
+    {
+        return smilePrefix + "/smileTickets/list";
+    }
+    @GetMapping("/smileTicketsDetail") // 演出详情
+    public String smileTicketsDetail() { return smilePrefix + "/smileTickets/detail"; }
+    @GetMapping("/smileTicketsData") // 销售数据
+    public String smileTicketsData() { return smilePrefix + "/smileTickets/data"; }
+
+    @GetMapping("/smileOrganizationList") // 组织架构列表
+    public String smileOrganizationList() { return smilePrefix + "/organization/list"; }
+    @GetMapping("/smileOrganizationDetail") // 组织架构详情
+    public String smileOrganizationDetail() { return smilePrefix + "/organization/detail"; }
+
+    @GetMapping("/smileSchoolList") // 学校列表
+    public String smileSchoolList() { return smilePrefix + "/school/list"; }
+    @GetMapping("/smileSchoolDetail") // 学校编辑
+    public String smileSchoolDetail() { return smilePrefix + "/school/detail"; }
+    // 小家伙路由结束
+
     @GetMapping("/integralList")
     public String integralList()
     {

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileAgentController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.smile;
+
+
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.zhengzai.smile.service.ISmileAgentService;
+import com.liquidnet.service.smile.entity.SmileAgent;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-16
+ */
+@Api(tags = "票提管理")
+@RestController
+@RequestMapping("/smile/agent")
+public class SmileAgentController {
+
+    @Autowired
+    ISmileAgentService smileAgentService;
+
+    @PostMapping("/list")
+    @ApiOperation("根据PerId获取票提")
+    @ResponseBody
+    public AjaxResult getAgent(@RequestParam(name = "performancesId", required = true)String performancesId){
+        return smileAgentService.getAgent(performancesId);
+    }
+
+    @PostMapping("/create")
+    @ApiOperation("创建/修改 票提")
+    @ResponseBody
+    public AjaxResult create(@RequestBody List<SmileAgent> smileAgents){
+        return smileAgentService.create(smileAgents);
+    }
+
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileOrganizationController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.smile;
+
+
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrgAndUserVo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationParam;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileOrganizationVo;
+import com.liquidnet.client.admin.zhengzai.smile.service.ISmileOrganizationService;
+import com.liquidnet.service.smile.entity.SmileOrganization;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-14
+ */
+@Api(tags = "组织管理")
+@RestController
+@RequestMapping("/smile/organization")
+public class SmileOrganizationController {
+
+    @Autowired
+    ISmileOrganizationService smileOrganizationService;
+
+    @PostMapping("/list")
+    @ApiOperation("获取组织列表")
+    @ResponseBody
+    public TableDataInfo organizationList(SmileOrganizationParam smileOrganizationParam){
+        TableDataInfo organizationList = smileOrganizationService.organizationList(smileOrganizationParam);
+        return organizationList;
+    }
+
+    @PostMapping("/create")
+    @ApiOperation("新增组织")
+    @ResponseBody
+    public AjaxResult create(@RequestBody SmileOrganizationVo smileOrganizationVo){
+        return smileOrganizationService.create(smileOrganizationVo);
+    }
+
+    @PostMapping("/updateOrg")
+    @ApiOperation("修改组织")
+    @ResponseBody
+    public AjaxResult updateOrg(@RequestBody SmileOrganization smileOrganization){
+        return smileOrganizationService.update(smileOrganization);
+
+    }
+
+    @PostMapping("/getOrgById")
+    @ApiOperation("根据组织id获取信息")
+    @ResponseBody
+    public AjaxResult getOrgById(@RequestParam(name = "id", required = true)Long id){
+        SmileOrgAndUserVo orgById = smileOrganizationService.getOrgById(id);
+        return AjaxResult.success(orgById);
+    }
+
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileSchoolController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.smile;
+
+
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileSchoolParam;
+import com.liquidnet.client.admin.zhengzai.smile.service.ISmileSchoolService;
+import com.liquidnet.service.smile.entity.SmileSchool;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-14
+ */
+@Api(tags = "学校管理")
+@RestController
+@RequestMapping("/smile/school")
+public class SmileSchoolController {
+
+    @Autowired
+    ISmileSchoolService iSmileSchoolService;
+
+
+    @PostMapping("/list")
+    @ApiOperation("获取学校列表")
+    @ResponseBody
+    public TableDataInfo schoolList(SmileSchoolParam smileSchoolParam) {
+        PageInfo<SmileSchool> smileSchools = iSmileSchoolService.schoolList(smileSchoolParam);
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(0);
+        rspData.setRows(smileSchools.getList());
+        rspData.setTotal(smileSchools.getTotal());
+        return rspData;
+    }
+
+    @GetMapping("/getSchoolById")
+    @ApiOperation("根据id获取学校")
+    @ResponseBody
+    public AjaxResult getSchoolById(@RequestParam(name = "id", required = true)Long id){
+        return AjaxResult.success(iSmileSchoolService.getSchoolById(id));
+    }
+
+    @PostMapping("/create")
+    @ApiOperation("新建学校")
+    @ResponseBody
+    public AjaxResult create(@RequestBody SmileSchool smileSchool){
+        return iSmileSchoolService.create(smileSchool);
+    }
+
+    @PostMapping("/updateById")
+    @ApiOperation("更具id修改学校")
+    @ResponseBody
+    public AjaxResult updateSchoolById(@RequestBody SmileSchool smileSchool){
+         return iSmileSchoolService.updateSchoolById(smileSchool);
+    }
+
+    @PostMapping("/del")
+    @ApiOperation("根据id删除学校")
+    @ResponseBody
+    public AjaxResult del(@RequestParam(name = "id", required = true)Long id){
+        return iSmileSchoolService.del(id);
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileShowController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.smile;
+
+
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.ShowSort;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmilePriceParam;
+import com.liquidnet.client.admin.zhengzai.smile.dto.SmileShowParam;
+import com.liquidnet.client.admin.zhengzai.smile.service.ISmileShowService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author TT
+ */
+@Api(tags = "演出管理")
+@RestController
+@RequestMapping("/smile/show")
+public class SmileShowController {
+
+    @Autowired
+    ISmileShowService smileShowService;
+
+    @PostMapping("/list")
+    @ApiOperation("演出列表")
+    @ResponseBody
+    public TableDataInfo schoolList(SmileShowParam smileShowParam) {
+        return smileShowService.listShow(smileShowParam);
+    }
+
+    @GetMapping("/getShowById")
+    @ApiOperation("根据演出id查询演出详情")
+    public AjaxResult getShowById(String performancesId) {
+        return smileShowService.getShowById(performancesId);
+    }
+
+    @PostMapping("/sort")
+    @ApiOperation("演出排序")
+    public AjaxResult sort(@RequestBody ShowSort showSort) {
+        return smileShowService.sort(showSort);
+    }
+
+    @PostMapping("/price")
+    @ApiOperation("个人打款打款")
+    public AjaxResult price(@RequestBody SmilePriceParam smilePriceParam) {
+        return smileShowService.price(smilePriceParam);
+    }
+
+    @PostMapping("/allPrice")
+    @ApiOperation("演出标识打款")
+    public AjaxResult allPrice(@RequestBody SmilePriceParam smilePriceParam){
+        return smileShowService.allPrice(smilePriceParam);
+    }
+
+    @PostMapping("/saleData")
+    @ApiOperation("销售数据")
+    public AjaxResult saleData(String performancesId){
+        return smileShowService.saleData(performancesId);
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/java/com/liquidnet/client/admin/web/controller/zhengzai/smile/SmileUserController.java

+package com.liquidnet.client.admin.web.controller.zhengzai.smile;
+
+import com.alibaba.druid.support.json.JSONUtils;
+import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.core.controller.BaseController;
+import com.liquidnet.client.admin.common.core.domain.AjaxResult;
+import com.liquidnet.client.admin.common.core.page.TableDataInfo;
+import com.liquidnet.client.admin.zhengzai.smile.dto.*;
+import com.liquidnet.client.admin.zhengzai.smile.service.ISmileUserService;
+import com.liquidnet.service.smile.entity.SmileUser;
+import com.liquidnet.service.smile.entity.dao.SmileUserCheckDao;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.util.ResourceUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.*;
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author liquidnet
+ * @since 2022-03-14
+ */
+@Api(tags = "用户管理,审核管理")
+@Controller
+@RequestMapping("/smile/user")
+public class SmileUserController extends BaseController {
+
+    @Autowired
+    ISmileUserService iSmileUserService;
+
+    @PostMapping("/list")
+    @ApiOperation(value = "获取用户列表")
+    @ResponseBody
+    public TableDataInfo userList(SmileUserParam smileUserParam) {
+        TableDataInfo rspData = iSmileUserService.userList(smileUserParam);
+        return rspData;
+    }
+
+    @PostMapping("/getUserById")
+    @ApiOperation(value = "根据ID查询单个用户完整信息")
+    @ResponseBody
+    public AjaxResult getUserById(@RequestParam(name = "uid", required = true) String uid) {
+        SmileUser smileUser = iSmileUserService.getUserById(uid);
+        return AjaxResult.success(smileUser);
+    }
+
+    @PostMapping("/create")
+    @ApiOperation(value = "保存用户（后端不用此接口）")
+    @ResponseBody
+    public AjaxResult create(@RequestBody SmileUser smileUser) {
+        if (iSmileUserService.create(smileUser)) {
+            return AjaxResult.success();
+        }
+        return AjaxResult.warn("用户已添加");
+    }
+
+    @PostMapping("/getUserListByOrgId")
+    @ApiOperation(value = "根据组织ID查询相人员信息")
+    @ResponseBody
+    public AjaxResult getUserListByOrgId(@RequestParam(name = "orgId", required = true) Long orgId, @RequestParam(name = "agentId", required = true) Long agentId) {
+        List<SmileUserVoOrg> userListByOrgId = iSmileUserService.getUserListByOrgId(orgId, agentId);
+        return AjaxResult.success(userListByOrgId);
+    }
+
+    @PostMapping("/updateUserStateByUid")
+    @ApiOperation(value = "根据uid修改用户状态 0：正常，1：黑名单")
+    @ResponseBody
+    public AjaxResult updateUserStateById(@RequestParam(name = "uid", required = true) String uid, @RequestParam(name = "state", required = true) Integer state) {
+        return iSmileUserService.updateUserStateById(uid, state);
+    }
+
+    @PostMapping("/check/list")
+    @ApiOperation("获取审核列表")
+    @ResponseBody
+    public TableDataInfo list(UserCheckParam userCheckParam) {
+        PageInfo<SmileUserCheckDao> list = iSmileUserService.listUserCheck(userCheckParam);
+        TableDataInfo rspData = new TableDataInfo();
+        rspData.setCode(0);
+        rspData.setRows(list.getList());
+        rspData.setTotal(list.getTotal());
+        return rspData;
+    }
+
+    @PostMapping("/check/updateById")
+    @ApiOperation("修改审核  通过审核  1：总代，2：普代")
+    @ResponseBody
+    public AjaxResult updateById(@RequestBody SmileUserCheckVo smileUserCheckVo) {
+        return iSmileUserService.updateUserCheckById(smileUserCheckVo);
+    }
+
+    @RequestMapping("getAreaJson")
+    @ApiOperation("省市区json")
+    @ResponseBody
+    public AjaxResult  getAreaJson(){
+        String jsonStr = "";
+        try {
+            String path = JSONUtils.class.getClassLoader().getResource("static/area.json").getPath();
+            File jsonFile = ResourceUtils.getFile(path);
+            logger.info("path:{}",path);
+//            File jsonFile = ResourceUtils.getFile("classpath:static/area.json");
+            InputStream inputStream = this.getClass().getClassLoader().getResourceAsStream("static/area.json");
+            Reader reader = new InputStreamReader(inputStream, "utf-8");
+            int ch = 0;
+            StringBuffer sb = new StringBuffer();
+            while ((ch = reader.read()) != -1) {
+                sb.append((char) ch);
+            }
+            reader.close();
+            jsonStr = sb.toString();
+            return AjaxResult.success(jsonStr);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            return null;
+        }
+    }
+}

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/bootstrap-dev.yml

@@ -6,7 +6,7 @@ liquidnet:
     username: user
     password: user123
   eureka:
-    host: 39.107.71.112:7001
+    host: 172.0.0.1:7001
 # end-dev-这里是配置信息基本值
 
 spring:

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/static/ajax/libs/picker/iPicker.min.js

+/*!
+ * iPicker v1.0.0
+ * Copyright (C) 2020, ZG
+ * Released under the MIT license.
+ */
+!function(d,b){"function"===typeof define&&define.amd?define(["jquery"],function(c){return b(d,c)}):"undefined"!==typeof module&&"object"===typeof exports?b(d,require("jquery")):b(d,d.jQuery)}("undefined"!==typeof window?window:this,function(d,b){!function(){if("undefined"===typeof jQuery)throw Error("iPicker's JavaScript requires jQuery");var c=b.fn.jquery.split(".");if(1===~~c[0]&&9>~~c[1])throw Error("iPicker's JavaScript requires jQuery version 1.9.0 or higher");}();b('style[data-from\x3d"iPicker"]').remove();b("head").prepend('\x3cstyle data-from\x3d"iPicker"\x3e.iPicker-container,.iPicker-container *{box-sizing:border-box}.iPicker-container{position:relative;float:left;width:200px;height:34px;font-size:14px;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.iPicker-container:not(:last-child){margin-right:10px}.iPicker-result{overflow:hidden;padding:0 40px 0 12px;height:34px;border:#dfdfdf solid 1px;border-radius:4px;background:#fff;color:#000;white-space:nowrap;line-height:32px;transition:border-color .2s}.iPicker-result span{display:block;float:left;width:calc(100% + 10px);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.iPicker-result-active:not(.iPicker-disabled),.iPicker-result:not(.iPicker-disabled):hover{border:#00b8ff solid 1px}.iPicker-result i{position:absolute;top:0;right:0;display:block;width:30px;height:34px}.iPicker-result i::before{position:absolute;top:0;right:2px;display:block;width:28px;height:100%;background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNTc2OTk1MjQ3Njc4IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI2NTAiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PC9zdHlsZT48L2RlZnM+PHBhdGggZD0iTTUzNS40NjY2NjcgODEyLjhsNDUwLjEzMzMzMy01NjMuMmMxNC45MzMzMzMtMTkuMiAyLjEzMzMzMy00OS4wNjY2NjctMjMuNDY2NjY3LTQ5LjA2NjY2N0g2MS44NjY2NjdjLTI1LjYgMC0zOC40IDI5Ljg2NjY2Ny0yMy40NjY2NjcgNDkuMDY2NjY3bDQ1MC4xMzMzMzMgNTYzLjJjMTIuOCAxNC45MzMzMzMgMzQuMTMzMzMzIDE0LjkzMzMzMyA0Ni45MzMzMzQgMHoiIHAtaWQ9IjI2NTEiIGZpbGw9IiMwMDAwMDAiPjwvcGF0aD48L3N2Zz4\x3d) center no-repeat;content:"";opacity:.5;transition:transform .3s;transform:scale(.55)}.iPicker-result-active i::before{transform:scale(.55) rotate(180deg)}.iPicker-placeholder{color:#aaa}.iPicker-disabled{cursor:not-allowed;background:#f0f0f0;color:#aaa}.iPicker-result.iPicker-disabled i{opacity:.5}.iPicker-list{position:relative;z-index:10;display:none;overflow-x:hidden;overflow-y:auto;padding:8px 0;max-height:300px;background:#fff;box-shadow:rgba(0,0,0,.1) 0 2px 6px;transform-origin:center top;animation-timing-function:ease-in-out;animation-duration:.3s;animation-fill-mode:forwards}.iPicker-list li,.iPicker-list ul{display:block;margin:0;padding:0}.iPicker-list li{display:block;padding:6px 12px;list-style:none;transition:.15s;word-break:break-all}.iPicker-list li.iPicker-list-active,.iPicker-list li:hover{background:#f5f5f5;color:#00b8ff}.iPicker-list-active{cursor:default}.iPicker-list.iPicker-list-hide,.iPicker-list.iPicker-list-show{display:block}.iPicker-list.iPicker-list-show{animation-name:iPickerShow}.iPicker-list.iPicker-list-hide{animation-name:iPickerHide}@keyframes iPickerShow{from{opacity:0;transform:scaleY(0)}to{opacity:1;transform:scaleY(1)}}@keyframes iPickerHide{from{opacity:1;transform:scaleY(1)}to{opacity:0;transform:scaleY(0)}}\x3c/style\x3e');b.fn.iPicker=function(c,d){if(!arguments.length){var k=[];b(this).first().find(".iPicker-result").each(function(){var a=(b(this).data("selected")||{}).value;a&&k.push(a)});return k}if("clear"===c)return this.each(function(){b(this).find(".iPicker-container:gt(0) ul").empty().end().find("li").removeClass("iPicker-list-active").end().find(".iPicker-result").addClass("iPicker-placeholder").removeData("selected").find("span").each(function(){b(this).text(b(this).data("placeholder"))})});if("reset"===c)return this.each(function(){var a=b(this).data("iPickerOptions");b.isPlainObject(a)&&!b.isEmptyObject(a)&&b(this).iPicker(a)});if("destroy"===c)return this.each(function(){b(this).empty().removeData("iPickerOptions");b(document).off("click.iPicker")});if("enabled"===c)return this.each(function(){var a=b(this).find(".iPicker-disabled");d?Array.isArray(d)&&d.length&&b.each(d,function(b,q){a.eq(q-1).removeClass("iPicker-disabled")}):a.removeClass("iPicker-disabled")});if(b.isPlainObject(c)&&c.data){var g=function(a){a.each(function(){var a=b(this);if(a.hasClass("iPicker-list-show"))a.off("animationend").prev().removeClass("iPicker-result-active").end().addClass("iPicker-list-hide").removeClass("iPicker-list-show").on("animationend",function(){a.off("animationend")})})},r=function(){"string"===typeof a.data&&b.trim(a.data)?b.getJSON(a.data).done(function(b){b?e.resolve(b):e.reject("\u6570\u636e\u52a0\u8f7d\u5931\u8d25")}).fail(function(){e.reject("\u6570\u636e\u52a0\u8f7d\u5931\u8d25")}):b.isPlainObject(a.data)&&!b.isEmptyObject(a.data)?e.resolve(a.data):"object"===typeof a.data&&a.data.then?a.data.then(function(b){b?e.resolve(b):e.reject("\u6570\u636e\u52a0\u8f7d\u5931\u8d25")},function(){e.reject("\u6570\u636e\u52a0\u8f7d\u5931\u8d25")}):e.reject("\u6570\u636e\u52a0\u8f7d\u5931\u8d25");return e},a=b.extend(!0,{data:{},level:3,width:200,maxHeight:300,disabled:!1,defaultValue:[],placeholder:["\u7701","\u5e02","\u533a"],onSelect:b.noop},c),t=b.isFunction(a.onSelect),l="";if(b.isNumeric(a.level)&&1<=a.level&&4>a.level)for(var m=0;m<parseInt(a.level);m++)l+='\r\n\x3cdiv class\x3d"iPicker-container"\x3e\r\n\x3cdiv class\x3d"iPicker-result iPicker-placeholder"\x3e\r\n\x3cspan\x3e\x3c/span\x3e\r\n\x3ci\x3e\x3c/i\x3e\r\n\x3c/div\x3e\r\n\x3cdiv class\x3d"iPicker-list"\x3e\r\n\x3cul\x3e\x3c/ul\x3e\r\n\x3c/div\x3e\r\n\x3c/div\x3e\r\n';var e=b.Deferred();return this.each(function(){var c=b(this),d=[];c.html(l).data("iPickerOptions",a);var e=c.find(".iPicker-container"),h=c.find(".iPicker-result"),f=c.find(".iPicker-list");b.isNumeric(a.maxHeight)&&46<=a.maxHeight&&f.css("maxHeight",parseInt(a.maxHeight)+"px");b.isNumeric(a.width)&&90<=a.width&&e.css("width",parseInt(a.width)+"px");a.disabled&&(c=[],!0===a.disabled?c=[0,1,2]:Array.isArray(a.disabled)&&a.disabled.length&&(c=a.disabled),b.each(c,function(b,a){0<=a&&2>=a&&h.eq(a).addClass("iPicker-disabled")}));Array.isArray(a.placeholder)&&a.placeholder.length&&h.find("span").each(function(c){c=a.placeholder[c]||"";b(this).data("placeholder",c).text(c)});f.each(function(){b(this).attr("data-id",Math.random().toString(36).substr(2,10))});r().done(function(c){function e(a,c){var n="";a&&(a="string"===typeof a?JSON.parse(a):a,a[c]&&b.each(a[c],function(a,b){n+='\x3cli data-code\x3d"'+a+'"\x3e'+b+"\x3c/li\x3e"}));return n}h.on("click",function(){var a=b(this),c=a.next(),e=c.data("id"),d=a.hasClass("iPicker-disabled");g(b(".iPicker-list").not('[data-id\x3d"'+e+'"]'));d||(a.toggleClass("iPicker-result-active"),c.hasClass("iPicker-list-show")?g(c):c.addClass("iPicker-list-show").removeClass("iPicker-list-hide"))});f.on("click.normal","li",function(){var a=b(this),d=a.parents(".iPicker-list"),p=a.parents(".iPicker-container");a.addClass("iPicker-list-active").siblings().removeClass("iPicker-list-active");d.prev().data("selected",{value:a.data("code"),text:a.text()}).removeClass("iPicker-placeholder").find("span").text(a.text());g(d);p.nextAll().find(".iPicker-result").removeData("selected").addClass("iPicker-placeholder").find("span").each(function(){b(this).text(b(this).data("placeholder"))}).end().next().find("ul").empty();p.next().find("ul").html(e(c,a.data("code")))}).on("click.select","li",function(){if(t){var c=[],e=[];h.each(function(){var a=b(this).data("selected")||{},d=a.value,a=a.text;d&&c.push(d);a&&e.push(a)});d=[];b.each(c,function(a,b){d.push({value:a,text:b})});a.onSelect.call(this,c,e,d)}});f.first().find("ul").html(e(c,"86"));Array.isArray(a.defaultValue)&&a.defaultValue.length&&b.each(a.defaultValue,function(a,b){f.eq(a).find('[data-code\x3d"'+b+'"]').trigger("click.normal")})}).fail(function(a){console.warn(a)});b(document).on("click.iPicker",function(a){e.is(a.target)||e.has(a.target).length||g(f)})})}}});
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/include.html

@@ -32,6 +32,7 @@
 	<script th:src="@{/ajax/libs/validate/jquery.validate.min.js}"></script>
 	<script th:src="@{/ajax/libs/validate/messages_zh.min.js}"></script>
 	<script th:src="@{/ajax/libs/validate/jquery.validate.extend.js}"></script>
+	<script th:src="@{/ajax/libs/picker/iPicker.min.js}"></script>
 	<!-- jquery-validate 表单树插件 -->
 	<script th:src="@{/ajax/libs/bootstrap-treetable/bootstrap-treetable.js}"></script>
 	<!-- 遮罩层 -->

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/iPicker.min.js

+/*!
+ * iPicker v1.0.0
+ * Copyright (C) 2020, ZG
+ * Released under the MIT license.
+ */
+!function(d,b){"function"===typeof define&&define.amd?define(["jquery"],function(c){return b(d,c)}):"undefined"!==typeof module&&"object"===typeof exports?b(d,require("jquery")):b(d,d.jQuery)}("undefined"!==typeof window?window:this,function(d,b){!function(){if("undefined"===typeof jQuery)throw Error("iPicker's JavaScript requires jQuery");var c=b.fn.jquery.split(".");if(1===~~c[0]&&9>~~c[1])throw Error("iPicker's JavaScript requires jQuery version 1.9.0 or higher");}();b('style[data-from\x3d"iPicker"]').remove();b("head").prepend('\x3cstyle data-from\x3d"iPicker"\x3e.iPicker-container,.iPicker-container *{box-sizing:border-box}.iPicker-container{position:relative;float:left;width:200px;height:34px;font-size:14px;cursor:pointer;-webkit-user-select:none;-moz-user-select:none;-ms-user-select:none;user-select:none}.iPicker-container:not(:last-child){margin-right:10px}.iPicker-result{overflow:hidden;padding:0 40px 0 12px;height:34px;border:#dfdfdf solid 1px;border-radius:4px;background:#fff;color:#000;white-space:nowrap;line-height:32px;transition:border-color .2s}.iPicker-result span{display:block;float:left;width:calc(100% + 10px);white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.iPicker-result-active:not(.iPicker-disabled),.iPicker-result:not(.iPicker-disabled):hover{border:#00b8ff solid 1px}.iPicker-result i{position:absolute;top:0;right:0;display:block;width:30px;height:34px}.iPicker-result i::before{position:absolute;top:0;right:2px;display:block;width:28px;height:100%;background:url(data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBzdGFuZGFsb25lPSJubyI/PjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+PHN2ZyB0PSIxNTc2OTk1MjQ3Njc4IiBjbGFzcz0iaWNvbiIgdmlld0JveD0iMCAwIDEwMjQgMTAyNCIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHAtaWQ9IjI2NTAiIHdpZHRoPSIxNiIgaGVpZ2h0PSIxNiIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiPjxkZWZzPjxzdHlsZSB0eXBlPSJ0ZXh0L2NzcyI+PC9zdHlsZT48L2RlZnM+PHBhdGggZD0iTTUzNS40NjY2NjcgODEyLjhsNDUwLjEzMzMzMy01NjMuMmMxNC45MzMzMzMtMTkuMiAyLjEzMzMzMy00OS4wNjY2NjctMjMuNDY2NjY3LTQ5LjA2NjY2N0g2MS44NjY2NjdjLTI1LjYgMC0zOC40IDI5Ljg2NjY2Ny0yMy40NjY2NjcgNDkuMDY2NjY3bDQ1MC4xMzMzMzMgNTYzLjJjMTIuOCAxNC45MzMzMzMgMzQuMTMzMzMzIDE0LjkzMzMzMyA0Ni45MzMzMzQgMHoiIHAtaWQ9IjI2NTEiIGZpbGw9IiMwMDAwMDAiPjwvcGF0aD48L3N2Zz4\x3d) center no-repeat;content:"";opacity:.5;transition:transform .3s;transform:scale(.55)}.iPicker-result-active i::before{transform:scale(.55) rotate(180deg)}.iPicker-placeholder{color:#aaa}.iPicker-disabled{cursor:not-allowed;background:#f0f0f0;color:#aaa}.iPicker-result.iPicker-disabled i{opacity:.5}.iPicker-list{position:relative;z-index:10;display:none;overflow-x:hidden;overflow-y:auto;padding:8px 0;max-height:300px;background:#fff;box-shadow:rgba(0,0,0,.1) 0 2px 6px;transform-origin:center top;animation-timing-function:ease-in-out;animation-duration:.3s;animation-fill-mode:forwards}.iPicker-list li,.iPicker-list ul{display:block;margin:0;padding:0}.iPicker-list li{display:block;padding:6px 12px;list-style:none;transition:.15s;word-break:break-all}.iPicker-list li.iPicker-list-active,.iPicker-list li:hover{background:#f5f5f5;color:#00b8ff}.iPicker-list-active{cursor:default}.iPicker-list.iPicker-list-hide,.iPicker-list.iPicker-list-show{display:block}.iPicker-list.iPicker-list-show{animation-name:iPickerShow}.iPicker-list.iPicker-list-hide{animation-name:iPickerHide}@keyframes iPickerShow{from{opacity:0;transform:scaleY(0)}to{opacity:1;transform:scaleY(1)}}@keyframes iPickerHide{from{opacity:1;transform:scaleY(1)}to{opacity:0;transform:scaleY(0)}}\x3c/style\x3e');b.fn.iPicker=function(c,d){if(!arguments.length){var k=[];b(this).first().find(".iPicker-result").each(function(){var a=(b(this).data("selected")||{}).value;a&&k.push(a)});return k}if("clear"===c)return this.each(function(){b(this).find(".iPicker-container:gt(0) ul").empty().end().find("li").removeClass("iPicker-list-active").end().find(".iPicker-result").addClass("iPicker-placeholder").removeData("selected").find("span").each(function(){b(this).text(b(this).data("placeholder"))})});if("reset"===c)return this.each(function(){var a=b(this).data("iPickerOptions");b.isPlainObject(a)&&!b.isEmptyObject(a)&&b(this).iPicker(a)});if("destroy"===c)return this.each(function(){b(this).empty().removeData("iPickerOptions");b(document).off("click.iPicker")});if("enabled"===c)return this.each(function(){var a=b(this).find(".iPicker-disabled");d?Array.isArray(d)&&d.length&&b.each(d,function(b,q){a.eq(q-1).removeClass("iPicker-disabled")}):a.removeClass("iPicker-disabled")});if(b.isPlainObject(c)&&c.data){var g=function(a){a.each(function(){var a=b(this);if(a.hasClass("iPicker-list-show"))a.off("animationend").prev().removeClass("iPicker-result-active").end().addClass("iPicker-list-hide").removeClass("iPicker-list-show").on("animationend",function(){a.off("animationend")})})},r=function(){"string"===typeof a.data&&b.trim(a.data)?b.getJSON(a.data).done(function(b){b?e.resolve(b):e.reject("\u6570\u636e\u52a0\u8f7d\u5931\u8d25")}).fail(function(){e.reject("\u6570\u636e\u52a0\u8f7d\u5931\u8d25")}):b.isPlainObject(a.data)&&!b.isEmptyObject(a.data)?e.resolve(a.data):"object"===typeof a.data&&a.data.then?a.data.then(function(b){b?e.resolve(b):e.reject("\u6570\u636e\u52a0\u8f7d\u5931\u8d25")},function(){e.reject("\u6570\u636e\u52a0\u8f7d\u5931\u8d25")}):e.reject("\u6570\u636e\u52a0\u8f7d\u5931\u8d25");return e},a=b.extend(!0,{data:{},level:3,width:200,maxHeight:300,disabled:!1,defaultValue:[],placeholder:["\u7701","\u5e02","\u533a"],onSelect:b.noop},c),t=b.isFunction(a.onSelect),l="";if(b.isNumeric(a.level)&&1<=a.level&&4>a.level)for(var m=0;m<parseInt(a.level);m++)l+='\r\n\x3cdiv class\x3d"iPicker-container"\x3e\r\n\x3cdiv class\x3d"iPicker-result iPicker-placeholder"\x3e\r\n\x3cspan\x3e\x3c/span\x3e\r\n\x3ci\x3e\x3c/i\x3e\r\n\x3c/div\x3e\r\n\x3cdiv class\x3d"iPicker-list"\x3e\r\n\x3cul\x3e\x3c/ul\x3e\r\n\x3c/div\x3e\r\n\x3c/div\x3e\r\n';var e=b.Deferred();return this.each(function(){var c=b(this),d=[];c.html(l).data("iPickerOptions",a);var e=c.find(".iPicker-container"),h=c.find(".iPicker-result"),f=c.find(".iPicker-list");b.isNumeric(a.maxHeight)&&46<=a.maxHeight&&f.css("maxHeight",parseInt(a.maxHeight)+"px");b.isNumeric(a.width)&&90<=a.width&&e.css("width",parseInt(a.width)+"px");a.disabled&&(c=[],!0===a.disabled?c=[0,1,2]:Array.isArray(a.disabled)&&a.disabled.length&&(c=a.disabled),b.each(c,function(b,a){0<=a&&2>=a&&h.eq(a).addClass("iPicker-disabled")}));Array.isArray(a.placeholder)&&a.placeholder.length&&h.find("span").each(function(c){c=a.placeholder[c]||"";b(this).data("placeholder",c).text(c)});f.each(function(){b(this).attr("data-id",Math.random().toString(36).substr(2,10))});r().done(function(c){function e(a,c){var n="";a&&(a="string"===typeof a?JSON.parse(a):a,a[c]&&b.each(a[c],function(a,b){n+='\x3cli data-code\x3d"'+a+'"\x3e'+b+"\x3c/li\x3e"}));return n}h.on("click",function(){var a=b(this),c=a.next(),e=c.data("id"),d=a.hasClass("iPicker-disabled");g(b(".iPicker-list").not('[data-id\x3d"'+e+'"]'));d||(a.toggleClass("iPicker-result-active"),c.hasClass("iPicker-list-show")?g(c):c.addClass("iPicker-list-show").removeClass("iPicker-list-hide"))});f.on("click.normal","li",function(){var a=b(this),d=a.parents(".iPicker-list"),p=a.parents(".iPicker-container");a.addClass("iPicker-list-active").siblings().removeClass("iPicker-list-active");d.prev().data("selected",{value:a.data("code"),text:a.text()}).removeClass("iPicker-placeholder").find("span").text(a.text());g(d);p.nextAll().find(".iPicker-result").removeData("selected").addClass("iPicker-placeholder").find("span").each(function(){b(this).text(b(this).data("placeholder"))}).end().next().find("ul").empty();p.next().find("ul").html(e(c,a.data("code")))}).on("click.select","li",function(){if(t){var c=[],e=[];h.each(function(){var a=b(this).data("selected")||{},d=a.value,a=a.text;d&&c.push(d);a&&e.push(a)});d=[];b.each(c,function(a,b){d.push({value:a,text:b})});a.onSelect.call(this,c,e,d)}});f.first().find("ul").html(e(c,"86"));Array.isArray(a.defaultValue)&&a.defaultValue.length&&b.each(a.defaultValue,function(a,b){f.eq(a).find('[data-code\x3d"'+b+'"]').trigger("click.normal")})}).fail(function(a){console.warn(a)});b(document).on("click.iPicker",function(a){e.is(a.target)||e.has(a.target).length||g(f)})})}}});
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/school/list.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('学校列表')"/>
+    <style>
+        #addClassify {
+            display: none;
+            width: 540px;
+            padding-top: 20px;
+        }
+        #addClassify .selectClassify {
+            display: flex;
+            align-items: center;
+            padding: 0 20px;
+        }
+        #addClassify .selectClassify label {
+            display: flex;
+            margin-right: 20px;
+            align-items: center;
+        }
+        #addClassify .selectClassify label input {
+            margin: 0;
+            margin-right: 2px;
+        }
+    </style>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>学校名称：</label>
+                            <input type="text" name="activityTitle"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+
+        <div class="btn-group-sm" id="toolbar" role="group">
+            <a class="btn btn-success" id="button-open-10">
+                <i class="fa fa-plus"></i> 添加
+            </a>
+        </div>
+        <div class="col-sm-12 select-table table-bordered">
+            <table id="bootstrap-table"></table>
+        </div>
+        <div id="addClassify">
+            <div class="selectClassify">
+                <div class="ibox-content">
+                    <div class="form-group">
+                        <div class="file-loading">
+                            <input class="schoolName" type="text" placeholder="学校名称" >
+                            <div class="picker">
+                                <div class="demo" id="demo-1"></div>
+                            </div>
+                            <input class="schoolAdress" type="text" placeholder="详细地址输入" >
+                        </div>
+                    </div>
+                </div>
+            </div>
+            <input type="hidden" class="editCon">
+            <div class="bottomBtn">
+                <a href="javascript:;" class="layui-layer-btn0" onclick="yes(1)">保存</a>
+                <a class="layui-layer-btn1 layui-layer-btn1" onclick="closeModal()">取消</a>
+            </div>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var drawListFlag = [[${@permission.hasPermi('smile:school:list')}]];
+    var prefix = ctx + "smile/school";
+    var adArr = {
+        addressStr: [],
+        addressIds: []
+    }
+    function yes() {
+        var schoolName = $('.schoolName').val();
+        var schoolAdress = $('.schoolAdress').val();
+        var editStatus = $('.editCon').val();
+        var postData = {
+            address: schoolAdress,
+            name: schoolName,
+            area: adArr.addressStr[2],
+            areaId: adArr.addressIds[2].toString(),
+            city: adArr.addressStr[1],
+            cityId: adArr.addressIds[1].toString(),
+            province: adArr.addressStr[0],
+            provinceId: adArr.addressIds[0].toString()
+        };
+        if (editStatus != '') {
+            postData.id = editStatus;
+            $.ajax({
+                type: 'post',
+                url: prefix + '/updateById',
+                headers:{"Content-Type":"application/json;charset=UTF-8"},
+                data: JSON.stringify(postData),
+                success:function(e) {
+                    $(".layui-layer-close1").click();
+                }
+            })
+        } else {
+            postData.id = 0;
+            $.ajax({
+                type: 'post',
+                url: prefix + '/create',
+                headers:{"Content-Type":"application/json;charset=UTF-8"},
+                data: JSON.stringify(postData),
+                success:function(e) {
+                    $(".layui-layer-close1").click();
+                }
+            })
+        }
+    }
+    function closeModal () {
+        $(".layui-layer-close1").click();
+    }
+    $("#button-open-10").click(function(){
+        $('.editCon').val('');
+        layer.open({
+            type: 1,
+            shade: true,
+            title: '创建学校', //不显示标题
+            content: $('#addClassify'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+            success: function () {
+                var $pre = $( "pre" );
+                var $picker = $( ".picker" );
+                $.getJSON( ctx + 'smile/user/getAreaJson' ).done(function ( res ) {
+                    $( "#demo-1" ).iPicker({
+                        data: JSON.parse(res.msg),
+                        // defaultValue: [ "230000", "230800", "230805" ],
+                        onSelect: function ( v, t, set ) {
+                            adArr.addressIds = v;
+                            adArr.addressStr = t;
+                        }
+                    });
+                })
+            },
+            cancel: function(res){
+                // layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6});
+            }
+        });
+    })
+
+    $(function () {
+        var options = {
+            url: prefix + "/list",
+            modalName: "学校列表",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'name',
+                    title: '学校名称'
+                },
+                {
+                    field: 'province',
+                    title: '地区'
+                },
+                {
+                    field: 'address',
+                    title: '详细地址'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function (value, row, index) {
+                        return `<a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="edit('${row.id}')">编辑</a>
+                            <a class="btn btn-info btn-xs" href="javascript:void(0)" onclick="del('${row.id}', '确认删除学校吗？')">删除</a>`
+                    }
+                }]
+        };
+
+        $.table.init(options);
+        
+    });
+    function del(id, notice) {
+        $.modal.confirm(notice, function() {
+            $.ajax({
+                type: 'post',
+                url: prefix + '/del',
+                data: { id: id},
+                success:function(e) {
+                    layer.msg("操作成功！");
+                }
+            })
+        });
+    }
+    function edit(id) {
+        layer.open({
+            type: 1,
+            shade: true,
+            title: '编辑学校',
+            content: $('#addClassify'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+            success: function () {
+                $.ajax({
+                    type: 'get',
+                    url: prefix + '/getSchoolById',
+                    data: {id: id},
+                    success:function(e) {
+                        $('.editCon').val(id);
+                        $('.schoolName').val(e.data.name);
+                        $('.schoolAdress').val(e.data.address);
+                        $.getJSON( ctx + 'smile/user/getAreaJson' ).done(function ( res ) {
+                            $( "#demo-1" ).iPicker({
+                                data: JSON.parse(res.msg),
+                                defaultValue: [e.data.provinceId, e.data.areaId, e.data.cityId],
+                                onSelect: function ( v, t, set ) {
+                                    adArr.addressIds = v;
+                                    adArr.addressStr = t;
+                                }
+                            });
+                        })
+                    }
+                })
+            },
+            cancel: function(res){
+                // layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6});
+            }
+        });
+    }
+
+    function openModal(id, data) {
+        console.log(id, data, 'dhsa')
+
+        $.modal.confirm(`确定要${title}此活动吗`, function() {
+            $.ajax({
+                type: 'put',
+                url: '/sweet/integralActivity/isOnline',
+                data: {integralActivityId: id, isOnline: lineId},
+                success:function(e) {
+                    console.log(e)
+                    $("button[name=refresh]").click();
+                }
+            })
+        });
+    }
+</script>
+</body>
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/data.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <th:block th:include="include :: header('待审核')"/>
+        <th:block th:include="include :: bootstrap-fileinput-css" />
+    </head>
+
+    <body class="white-bg">
+        <div class="detail_status">用户状态：<span></span></div>
+        <p class="detail_title">基础资料</p>
+        <p>照片</p>
+        <div class="detail_inner detail_img"><img src=""></div>
+        <p>真实姓名</p>
+        <div class="detail_inner detail_name"></div>
+        <p>出生日期</p>
+        <div class="detail_inner detail_time"></div>
+        <p>性别</p>
+        <div class="detail_inner detail_sex"></div>
+        <p>所在城市</p>
+        <div class="detail_inner detail_city"></div>
+        <p>你的身份</p>
+        <div class="detail_inner detail_id"></div>
+        <p>学校全称/单位名称</p>
+        <div class="detail_inner detail_school"></div>
+        <p>所学专业/所在部门</p>
+        <div class="detail_inner detail_acc"></div>
+        <p>微信号</p>
+        <div class="detail_inner detail_wx"></div>
+        <p class="detail_title">认证信息</p>
+        <p>姓名：</p>
+        <div class="detail_inner detail_name"></div>
+        <p>身份证号：</p>
+        <div class="detail_inner detail_idcode"></div>
+        <p class="detail_title">自我介绍</p>
+        <div class="detail_inner detail_desc"></div>
+        <p>手机号：</p>
+        <div class="detail_inner detail_mobail"></div>
+        <p>提交时间：</p>
+        <div class="detail_inner detail_created"></div>
+        <div class="bottomBtn">
+            <a href="javascript:;" class="layui-layer-btn0" onclick="yes(1)">通过</a>
+            <a class="layui-layer-btn1 layui-layer-btn1" onclick="closeModal(0)">驳回</a>
+        </div>
+    </body>
+
+    <th:block th:include="include :: footer"/>
+    <script th:src="@{/js/jquery.tmpl.js}"></script>
+    <th:block th:include="include :: bootstrap-fileinput-js" />
+
+    <script type="text/javascript">
+        var smilePrefix = ctx + "smile/user";
+        var penddingId = window.localStorage.getItem('penddingId');
+        $.ajax({
+            type: 'post',
+            url: smilePrefix + "/getUserById",
+            data: {
+                uid: penddingId
+            },
+            success:function(e) {
+                var detailData = e.data;
+                if (detailData.type == 0) {
+                    $('.detail_status span').text('未认证');
+                }
+                $('.detail_img img').attr('src', detailData.img);
+                $('.detail_name').text(detailData.name);
+                $('.detail_time').text(detailData.birthday);
+                if (detailData.sex == 1) {
+                    $('.detail_sex').text('男');
+                } else {
+                    $('.detail_sex').text('女');
+                }
+                $('.detail_city').text(detailData.province + detailData.city + detailData.area);
+                if (detailData.identity == 1) {
+                    $('.detail_id').text('在校学生');
+                } else {
+                    $('.detail_id').text('已毕业');
+                }
+                $('.detail_school').text(detailData.schoolName);
+                $('.detail_acc').text(detailData.schoolMajor);
+                $('.detail_wx').text(detailData.wechat);
+                $('.detail_name').text(detailData.name);
+                $('.detail_idcode').text(detailData.idCard);
+                $('.detail_desc').text(detailData.introduce);
+                $('.detail_mobail').text(detailData.phone);
+                $('.detail_created').text(detailData.createdDate);
+            }
+        })
+    </script>
+
+    <style>
+        .white-bg {
+            padding: 50px;
+        }
+        .white-bg .detail_inner {
+            margin-bottom: 20px;
+        }
+        .white-bg .detail_title {
+            margin-top: 50px;
+            font-weight: bold;
+            font-size: 16px;
+        }
+        .bottomBtn {
+            text-align: left;
+            padding: 10px 15px 12px;
+        }
+    </style>
+
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/smileTickets/detail.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+    <head>
+        <th:block th:include="include :: header('演出详情')"/>
+        <th:block th:include="include :: bootstrap-fileinput-css" />
+    </head>
+
+    <body class="white-bg">
+        <div class="detail_title">演出名称：<span></span></div>
+        <div class="detail_inner detail_img"><img src=""></div>
+        <p>演出时间</p>
+        <div class="detail_inner detail_time"></div>
+        <p>演出地点</p>
+        <div class="detail_inner detail_place"></div>
+        <p>票提设置</p>
+        <div class="detail_inner detail_option"></div>
+        <p>代理票种</p>
+        <div class="detail_inner detail_pur"></div>
+        <p>演出详情</p>
+        <div class="detail_inner detail_main"></div>
+    </body>
+
+    <th:block th:include="include :: footer"/>
+    <script th:src="@{/js/jquery.tmpl.js}"></script>
+    <th:block th:include="include :: bootstrap-fileinput-js" />
+
+    <script type="text/javascript">
+        var smilePrefix = ctx + "smile/show";
+        var perId = window.localStorage.getItem('performancesId');
+        $.ajax({
+            type: 'get',
+            url: smilePrefix + "/getShowById",
+            data: {
+                performancesId: perId
+            },
+            success:function(e) {
+                $('.detail_title span').text(e.data.title);
+                $('.detail_img img').attr('src', e.data.imgPoster);
+                $('.detail_time').text(e.data.timeStart + '-' + e.data.timeEnd);
+                $('.detail_place').text(e.data.fieldName);
+                $('.detail_option').text(e.data.detail_option);
+            }
+        })
+    </script>
+
+    <style>
+        .white-bg {
+            padding: 50px;
+        }
+        .white-bg .detail_inner {
+            margin-bottom: 20px;
+        }
+        .white-bg .detail_title {
+            margin-top: 50px;
+            font-weight: bold;
+            font-size: 16px;
+        }
+        .bottomBtn {
+            text-align: left;
+            padding: 10px 15px 12px;
+        }
+    </style>
+
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userList/list.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('用户列表')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>手机号：</label>
+                            <input type="number" name="phone"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+<!--                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i-->
+<!--                                    class="fa fa-refresh"></i>&nbsp;重置</a>-->
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+        <div class="col-sm-12 select-table table-bordered">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var detailFlag = [[${@permission.hasPermi('smile:performances:detail')}]];
+    var smilePrefix = ctx + "smile/user";
+    console.log(smilePrefix);
+
+    //     // createUrl: prefix + "/add",
+    //     // updateUrl: prefix + "/edit/{id}",
+    //     // removeUrl: prefix + "/remove",
+    //     // exportUrl: prefix + "/export",
+    //     // modalName: "订单",
+    $(function() {
+        var options = {
+            url: smilePrefix + "/list",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'uid',
+                    title: '用户id'
+                },
+                {
+                    field: 'img',
+                    title: '生活照',
+                    formatter: function(value, row, index) {
+                        return $.table.imageView(value,"300", "300");
+                    }
+                },
+                {
+                    field: 'name',
+                    title: '姓名'
+                },
+                {
+                    field: 'sex',
+                    title: '性别',
+                    formatter: function(value, row, index) {
+                        if (value == 1) {
+                            return '男';
+                        } else {
+                            return '女';
+                        }
+                    }
+                },
+                {
+                    field: 'birthday',
+                    title: '生日'
+                },
+                {
+                    field: 'phone',
+                    title: '手机号'
+                },
+                {
+                    field: 'identity',
+                    title: '身份',
+                    formatter: function(value, row, index) {
+                        if (value == 1) {
+                            return '在校学生';
+                        } else {
+                            return '已毕业';
+                        }
+                    }
+                },
+                {
+                    field: 'schoolName',
+                    title: '学校/公司名称'
+                },
+                {
+                    field: 'province',
+                    title: '地区'
+                },
+                {
+                    field: 'type',
+                    title: '类型',
+                    formatter: function(value, row, index) {
+                        if (value == 1) {
+                            return '总代';
+                        } else {
+                            return '普代';
+                        }
+                    }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.mid + '\')"><i class="fa fa-edit"></i>查看</a> ');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+
+        console.log(options)
+    });
+    // var updateFlag = [[${@permission.hasPermi('sweet:integralActivity:create')}]];
+    // var isOnlineFlag = [[${@permission.hasPermi('sweet:integralActivity:isOnline')}]];
+    // var drawListFlag = [[${@permission.hasPermi('sweet:integralActivityDraw:list')}]];
+    // var exportExcelFlag = [[${@permission.hasPermi('sweet:integralActivityDraw:exportExcel')}]];
+
+    // var prefix = ctx + "sweet/integralActivity";
+
+</script>
+</body>
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/detail.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <th:block th:include="include :: header('待审核')"/>
+    <th:block th:include="include :: bootstrap-fileinput-css"/>
+</head>
+
+<body class="white-bg">
+<div class="detail_status">用户状态：<span></span></div>
+<p class="detail_title">基础资料</p>
+<p>照片</p>
+<div class="detail_inner detail_img"><img src=""></div>
+<p>真实姓名</p>
+<div class="detail_inner detail_name"></div>
+<p>出生日期</p>
+<div class="detail_inner detail_time"></div>
+<p>性别</p>
+<div class="detail_inner detail_sex"></div>
+<p>所在城市</p>
+<div class="detail_inner detail_city"></div>
+<p>你的身份</p>
+<div class="detail_inner detail_id"></div>
+<p>学校全称/单位名称</p>
+<div class="detail_inner detail_school"></div>
+<p>所学专业/所在部门</p>
+<div class="detail_inner detail_acc"></div>
+<p>微信号</p>
+<div class="detail_inner detail_wx"></div>
+<p class="detail_title">认证信息</p>
+<p>姓名：</p>
+<div class="detail_inner detail_name"></div>
+<p>身份证号：</p>
+<div class="detail_inner detail_idcode"></div>
+<p class="detail_title">自我介绍</p>
+<div class="detail_inner detail_desc"></div>
+<p>手机号：</p>
+<div class="detail_inner detail_mobail"></div>
+<p>提交时间：</p>
+<div class="detail_inner detail_created"></div>
+<div class="bottomBtn" id="btn-commit">
+    <a href="javascript:" class="a-success layui-layer-btn0" onclick="yes(1)">通过</a>
+    <a class="layui-layer-btn1 layui-layer-btn1 a-fail" onclick="closeModal(0)">驳回</a>
+</div>
+
+
+<div id="addClassify">
+    <div class="selectClassify">
+        <div class="ibox-content">
+            <div class="form-group">
+                <p>选择身份</p>
+                <input class="idst_radio" name="idst" type="radio" value="1">总代
+                <input class="idst_radio" name="idst" type="radio" value="2">普代
+            </div>
+            <div class="form-group">
+                <select name="bindType" id="selectTwo" placeholder="请选择分组"></select>
+            </div>
+        </div>
+    </div>
+    <input type="hidden" class="editCon">
+    <div class="bottomBtn">
+        <a href="javascript:;" class="layui-layer-btn0" onclick="confirm(1)">确认通过</a>
+    </div>
+</div>
+
+
+<div id="addClassify_false">
+    <div class="selectClassify">
+        <div class="ibox-content">
+            <div class="form-group">
+                <input class="reason_text" type="textarea" placeholder="请输入驳回原因">
+            </div>
+        </div>
+    </div>
+    <input type="hidden" class="editCon">
+    <div class="bottomBtn">
+        <a href="javascript:;" class="layui-layer-btn0" onclick="confirm(0)">驳回</a>
+    </div>
+</div>
+</body>
+
+<th:block th:include="include :: footer"/>
+<script th:src="@{/js/jquery.tmpl.js}"></script>
+<th:block th:include="include :: bootstrap-fileinput-js"/>
+
+<script type="text/javascript">
+    var smilePrefix = ctx + "smile/user";
+    var orifix = ctx + "smile/organization";
+    var penddingId = window.localStorage.getItem('penddingId');
+
+    var detailObj = {}
+    $.ajax({
+        type: 'post',
+        url: smilePrefix + "/getUserById",
+        data: {
+            uid: penddingId
+        },
+        success: function (e) {
+            var detailData = e.data;
+            detailObj = detailData;
+            if (detailData.type == 0) {
+                $('.detail_status span').text('未认证');
+            }
+            $('.detail_img img').attr('src', detailData.img);
+            $('.detail_name').text(detailData.name);
+            $('.detail_time').text(detailData.birthday);
+            if (detailData.sex == 1) {
+                $('.detail_sex').text('男');
+            } else {
+                $('.detail_sex').text('女');
+            }
+            $('.detail_city').text(detailData.province + detailData.city + detailData.area);
+            if (detailData.identity == 1) {
+                $('.detail_id').text('在校学生');
+            } else {
+                $('.detail_id').text('已毕业');
+            }
+            $('.detail_school').text(detailData.schoolName);
+            $('.detail_acc').text(detailData.schoolMajor);
+            $('.detail_wx').text(detailData.wechat);
+            $('.detail_name').text(detailData.name);
+            $('.detail_idcode').text(detailData.idCard);
+            $('.detail_desc').text(detailData.introduce);
+            $('.detail_mobail').text(detailData.phone);
+            $('.detail_created').text(detailData.createdDate);
+            if (detailData.type != 0) {
+                document.getElementById("btn-commit").style.visibility = "hidden";
+            }
+        }
+    })
+
+    function closeModal() {
+        layer.open({
+            type: 1,
+            shade: true,
+            title: '驳回', //不显示标题
+            content: $('#addClassify_false') //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+        });
+    }
+
+    function confirm(num) {
+        if (num == 1) {
+            var postData = {
+                id: Number(detailObj.id),
+                orgId: Number(detailObj.orgId),
+                type: Number(detailObj.type),
+                uid: detailObj.uid,
+            }
+        } else {
+            var postData = {
+                id: Number(detailObj.id),
+                orgId: '',
+                type: 4,
+                uid: detailObj.uid,
+                reason: $('.reason_text').val()
+            }
+        }
+        $.ajax({
+            type: 'post',
+            url: smilePrefix + "/check/updateById",
+            headers: {"Content-Type": "application/json;charset=UTF-8"},
+            data: JSON.stringify(postData),
+            success: function (e) {
+                $(".layui-layer-close1").click();
+                alert(e.msg)
+                location.reload();
+            }
+        })
+    }
+
+    function yes() {
+        layer.open({
+            type: 1,
+            shade: true,
+            title: '通过', //不显示标题
+            content: $('#addClassify'), //捕获的元素，注意：最好该指定的元素要存放在body最外层，否则可能被其它的相对元素所影响
+            success: function () {
+                $("input[name=idst]").change(function (e) {
+                    detailObj.type = e.target.value;
+                    var postData = {
+                        pageNum: 40,
+                        pageSize: 1
+                    }
+                    $.ajax({
+                        type: 'post',
+                        url: orifix + '/list',
+                        data: JSON.stringify(postData),
+                        success: function (res) {
+                            $('#selectTwo').html('');
+
+                            $('#selectTwo').append('<option value="0">请选择</option>');
+                            for (var i in res.rows) {
+                                $('#selectTwo').append('<option value="' + res.rows[i].id + '">' + res.rows[i].name + '</option>');
+                            }
+                            $('#selectTwo').change(function () {
+                                detailObj.orgId = $('#selectTwo option:selected').val();
+                            })
+                        }
+                    })
+                });
+            },
+            cancel: function (res) {
+                // layer.msg('捕获就是从页面已经存在的元素上，包裹layer的结构', {time: 5000, icon:6});
+            }
+        });
+    }
+</script>
+
+<style>
+    .white-bg {
+        padding: 50px;
+    }
+
+    .white-bg .detail_inner {
+        margin-bottom: 20px;
+    }
+
+    .white-bg .detail_title {
+        margin-top: 50px;
+        font-weight: bold;
+        font-size: 16px;
+    }
+
+    .bottomBtn {
+        text-align: left;
+        padding: 10px 15px 12px;
+    }
+
+    #addClassify, #addClassify_false {
+        display: none;
+        width: 540px;
+        padding-top: 20px;
+    }
+
+    #addClassify .selectClassify {
+        display: flex;
+        align-items: center;
+        padding: 0 20px;
+    }
+
+    #addClassify .selectClassify label {
+        display: flex;
+        margin-right: 20px;
+        align-items: center;
+    }
+
+    #addClassify .selectClassify label input {
+        margin: 0;
+        margin-right: 2px;
+    }
+
+    #detailPro .detail_inner {
+        margin-bottom: 20px;
+    }
+
+    #detailPro .detail_title {
+        margin-top: 50px;
+        font-weight: bold;
+        font-size: 16px;
+    }
+</style>
+
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/smile/userPendingList/list.html

+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('待审核列表')"/>
+</head>
+<body class="gray-bg">
+<div class="container-div">
+    <div class="row">
+        <div class="col-sm-12 search-collapse">
+            <form id="formId">
+                <div class="select-list">
+                    <ul>
+                        <li>
+                            <label>手机号：</label>
+                            <input type="text" name="activityTitle"/>
+                        </li>
+                        <li>
+                            <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i
+                                    class="fa fa-search"></i>&nbsp;搜索</a>
+<!--                            <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i-->
+<!--                                    class="fa fa-refresh"></i>&nbsp;重置</a>-->
+                        </li>
+                    </ul>
+                </div>
+            </form>
+        </div>
+        <div class="col-sm-12 select-table table-bordered">
+            <table id="bootstrap-table"></table>
+        </div>
+    </div>
+</div>
+<th:block th:include="include :: footer"/>
+<script th:inline="javascript">
+    var detailFlag = [[${@permission.hasPermi('smile:userPendingList:detail')}]];
+    var smilePrefix = ctx + "smile/user";
+
+    //     // createUrl: prefix + "/add",
+    //     // updateUrl: prefix + "/edit/{id}",
+    //     // removeUrl: prefix + "/remove",
+    //     // exportUrl: prefix + "/export",
+    //     // modalName: "订单",
+    $(function() {
+        var options = {
+            url: smilePrefix + "/check/list",
+            columns: [{
+                checkbox: true
+            },
+                {
+                    field: 'uid',
+                    title: '用户id'
+                },
+                {
+                    field: 'img',
+                    title: '生活照',
+                    formatter: function(value, row, index) {
+                        return $.table.imageView(value,"300", "300");
+                    }
+                },
+                {
+                    field: 'name',
+                    title: '姓名'
+                },
+                {
+                    field: 'sex',
+                    title: '性别',
+                    formatter: function(value, row, index) {
+                        if (value == 1) {
+                            return '男';
+                        } else {
+                            return '女';
+                        }
+                    }
+                },
+                {
+                    field: 'birthday',
+                    title: '生日'
+                },
+                {
+                    field: 'phone',
+                    title: '手机号'
+                },
+                {
+                    field: 'identity',
+                    title: '身份',
+                    formatter: function(value, row, index) {
+                        if (value == 1) {
+                            return '在校学生';
+                        } else {
+                            return '已毕业';
+                        }
+                    }
+                },
+                {
+                    field: 'schoolName',
+                    title: '学校/公司名称'
+                },
+                {
+                    field: 'area',
+                    title: '地区'
+                },
+                {
+                    field: 'type',
+                    title: '状态',
+                    formatter: function(value, row, index) {
+                        if (value == 0) {
+                            return '未审核';
+                        } else if (value == 1) {
+                            return '总代';
+                        } else if (value == 2) {
+                            return '普代';
+                        } else if (value == 3) {
+                            return '未认证';
+                        } else {
+                            return '已驳回';
+                        }
+                    }
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + detailFlag + '" href="javascript:void(0)" onclick="toDetail(\'' + row.uid + '\')"><i class="fa fa-edit"></i>查看</a> ');
+                        return actions.join('');
+                    }
+                }]
+        };
+        $.table.init(options);
+    });
+
+    /* 跳转详情 */
+    function toDetail(id) {
+        window.localStorage.setItem('penddingId', id);
+        var url = '/local/smilePendingDetail';
+        $.modal.openTab("待审核详情", url);
+    }
+</script>
+</body>
+</html>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/pom.xml

@@ -151,7 +151,18 @@
             <artifactId>liquidnet-service-goblin-api</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-smile-do</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.liquidnet</groupId>
+            <artifactId>liquidnet-service-smile-api</artifactId>
+            <version>1.0-SNAPSHOT</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinPerformancesAdminServiceImpl.java

 package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
+import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.service.InnerService;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.PerformanceVoUtils;
 import com.liquidnet.client.admin.zhengzai.slime.service.ISlimeAuthorizationRecordsAdminService;
+import com.liquidnet.client.admin.zhengzai.smile.utils.SmileRedisUtils;
 import com.liquidnet.commons.lang.util.BeanUtil;
 import com.liquidnet.commons.lang.util.DateUtil;
 import com.liquidnet.service.kylin.constant.KylinRedisConst;
@@ -26,6 +29,8 @@ import com.liquidnet.service.kylin.dto.vo.partner.TicketTimesTicketCreatePartner
 import com.liquidnet.service.kylin.entity.*;
 import com.liquidnet.service.kylin.mapper.*;
 import com.liquidnet.service.kylin.service.admin.IKylinPerformancesAdminService;
+import com.liquidnet.service.smile.entity.SmileAgent;
+import com.liquidnet.service.smile.mapper.SmileAgentMapper;
 import com.mongodb.BasicDBObject;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -85,6 +90,15 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
     @Autowired
     InnerService innerService;
 
+    @Autowired
+    SmileRedisUtils smileRedisUtils;
+
+    @Autowired
+    SmileAgentMapper smileAgentMapper;
+
+    @Autowired
+    KylinPerformancesMapper kylinPerformancesMapper;
+
     @Override
     public void test() {
 //        //同步演出
@@ -584,6 +598,31 @@ public class KylinPerformancesAdminServiceImpl extends ServiceImpl<KylinPerforma
             ticketStatus.setIsAgent(status);
             ticketStatusMapper.update(ticketStatus, new UpdateWrapper<KylinTicketStatus>().eq("ticket_id", ticketId));
             performanceVoUtils.performanceVoStatus(performancesId);
+            List<KylinPerformances> kylinPerformances = kylinPerformancesMapper.selectPerIdByAgent();
+            //存入票提默认 总代 普代都为0  默认0.000
+            SmileAgent smileAgent = new SmileAgent();
+            smileAgent.setPerformanceId(performancesId);
+            smileAgent.setTicketId(ticketId);
+            LambdaQueryWrapper<SmileAgent> queryWrapper = Wrappers.lambdaQuery(SmileAgent.class);
+            queryWrapper.eq(SmileAgent::getPerformanceId,performancesId);
+            queryWrapper.eq(SmileAgent::getTicketId,ticketId);
+            if (status.equals(1)){
+                queryWrapper.eq(SmileAgent::getDelTag,0);
+                SmileAgent agent = smileAgentMapper.selectOne(queryWrapper);
+                if (agent==null){
+                    smileAgentMapper.insert(smileAgent);
+                }
+            }else {
+                smileAgent.setDelTag(1);
+                smileAgentMapper.update(smileAgent,queryWrapper);
+            }
+
+
+            List<String> collect = kylinPerformances.stream().map(KylinPerformances::getPerformancesId).collect(Collectors.toList());
+            String perId = StringUtils.join(collect,",");
+            if (!"".equals(perId)){
+                smileRedisUtils.setShowIds(perId);
+            }
             return true;
         } catch (Exception e) {
             return false;

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundExecuteServiceImpl.java

@@ -137,7 +137,7 @@ public class KylinRefundExecuteServiceImpl {
         }
 
         int count = 0;
-        int limitNum = 20;
+        int limitNum = 1000;
         int mid = 0;
         do {
             List<KylinOrderRefunds> refundList = kylinOrderRefundsMapper.getRefundList(whereType, refundBatchId, whereStatus, mid, limitNum);

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-zhengzai/src/main/java/com/liquidnet/client/admin/zhengzai/kylin/service/impl/KylinRefundsStatusServiceImpl.java

@@ -3,6 +3,7 @@ package com.liquidnet.client.admin.zhengzai.kylin.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.liquidnet.client.admin.common.utils.StringUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.DataUtils;
 import com.liquidnet.client.admin.zhengzai.kylin.utils.MongoVoUtils;
@@ -41,6 +42,7 @@ import java.time.LocalDateTime;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -403,6 +405,15 @@ public class KylinRefundsStatusServiceImpl {
         kylinOrderRefunds.setRefuse(refundApplyParam.getRefuse());
 
         for (KylinOrderRefunds refund : refundList) {
+            KylinOrderRefunds orderRefundsOld = kylinOrderRefundsMapper.selectOne(
+                    Wrappers.lambdaQuery(KylinOrderRefunds.class)
+                            .eq(KylinOrderRefunds::getOrderRefundsId, refund.getOrderRefundsId())
+            );
+            if (!Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_APPROVED)
+                && !Objects.equals(orderRefundsOld.getStatus(), KylinTableStatusConst.ORDER_REFUND_STATUS_TICKET)
+            ) {
+                continue;
+            }
             // 更新退款表
             kylinOrderRefunds.setUpdatedAt(LocalDateTime.now());
             kylinOrderRefundsMapper.update(

liquidnet-bus-common/liquidnet-common-cache/liquidnet-common-cache-redis/src/main/java/com.liquidnet.common.cache/redis/util/RedisUtil.java

@@ -34,7 +34,7 @@ public final class RedisUtil extends AbstractRedisUtil{
 
     public static void main(String[] args) {
         String[] keys = {
-                "kylin:member:uid:809406",
+                "smile:user1013431194887946248794794",
         };
         for (String key : keys) {
             long value = key.hashCode();

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

+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liquidnet.service.goblin.mapper.SmileUserMapper">
+
+</mapper>