app开发

common/src/main/java/com/winsun/bean/Order.java

@@ -226,7 +226,7 @@ public class Order implements Serializable{
 	/**
 	/**
 	 * 学校
 	 * 学校
 	 */
 	 */
-	//private String userSchool;
+	private String userSchool;
 
 
 	/**
 	/**
 	 * 学生证审核状态， 0 未审核，1已审核
 	 * 学生证审核状态， 0 未审核，1已审核

common/src/main/java/com/winsun/bean/YangChengTong.java

+package com.winsun.bean;
+
+import com.baomidou.mybatisplus.annotations.TableId;
+import com.baomidou.mybatisplus.annotations.TableName;
+import com.baomidou.mybatisplus.enums.IdType;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 学校信息
+ */
+@Data
+@TableName("hhr_yangchengtong")
+public class YangChengTong implements Serializable {
+
+    /**
+     * 主键
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private int id;
+
+
+    /**
+     *姓名
+     */
+    private String customer_name;
+
+    /**
+     * 登记的手机号
+     */
+    private String customer_phone;
+
+    /**
+     * 学校
+     */
+    private String school;
+
+    /**
+     * '联系方式 手机号'
+     */
+    private String contact_phone;
+
+    /**
+     * 联系地址
+     */
+    private String contact_address;
+
+
+}

common/src/main/java/com/winsun/constant/UserType.java

+package com.winsun.constant;
+
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * 排序
+ * @author Liph
+ * @datetime 2019-09-19/9/27 11:19
+ */
+public enum UserType {
+    //1：老客户；0新客户;2:老客户续约3：融合 4：抽奖；5：单宽；6：羊城通卡
+    OLDCUSTOMER("1", "老客户"),
+    NEWCUSTOMER("0", "新客户"),
+    OLDCUSTOMERRENEW ("2", "老客户续约"),
+    RH("3", "融合"),
+    LUCKYDRAW("4", "抽奖"),
+    DY("5", "单宽"),
+    YCTK("6", "羊城通卡");
+    UserType(String id, String name) {
+        this.id = id;
+        this.name = name;
+    };
+
+    private static final Map<String, UserType> DATAS = new HashMap<>();
+    static {
+        Arrays.asList(values()).forEach(data -> DATAS.put(data.getId(), data));
+    }
+
+    private String id;
+
+    private String name;
+
+    public String getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public static UserType findById(String id) {
+        return DATAS.getOrDefault(id, null);
+    }
+}

common/src/main/java/com/winsun/mapper/PackageUpgradeMapper.java

@@ -2,12 +2,14 @@ package com.winsun.mapper;
 
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.winsun.bean.PackageUpgrade;
 import com.winsun.bean.PackageUpgrade;
+import org.apache.ibatis.annotations.Insert;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Select;
 import org.springframework.stereotype.Component;
 import org.springframework.stereotype.Component;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 
 
+import java.util.Date;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 
 
@@ -21,4 +23,21 @@ public interface PackageUpgradeMapper extends BaseMapper<PackageUpgrade> {
 
 
     @Select("<script>SELECT * FROM `hhr_xyzx_yd_yrym_list` <where> ${ew.sqlSegment} </where> </script>")
     @Select("<script>SELECT * FROM `hhr_xyzx_yd_yrym_list` <where> ${ew.sqlSegment} </where> </script>")
     List<Map<String,Object>> selectPackage(@Param("ew") Wrapper<PackageUpgrade> wrapper);
     List<Map<String,Object>> selectPackage(@Param("ew") Wrapper<PackageUpgrade> wrapper);
+
+    @Select("select school from `hhr_user_view` where id = #{partner}")
+    String selectShoolByUserId(String partner);
+
+    @Insert("insert into `hhr_order_history` values(#{id},#{status},#{date}) ")
+    Integer inserOrderHis(@Param("id")String id, @Param("status")String status, @Param("date")Date date);
+
+    @Insert("select *  from `hhr_order_history` where  oredr_id = #{oredrId}")
+    List<Map<String,Object>> selectOrderHis(String oredrId);
+
+    @Select("select school_id schoolId from `hhr_user_school` where  user_id = #{partner}")
+    String selectSchoolId(String partner);
+
+    @Select("select package_id packageId from `hhr_user_school` where  school_id = #{schoolId}")
+    List<String> selectPackageId(String schoolId);
+
+
 }
 }

common/src/main/java/com/winsun/mapper/YangChengTongrMapper.java

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import com.winsun.bean.YangChengTong;
+import org.apache.ibatis.annotations.Mapper;
+import org.springframework.stereotype.Component;
+
+@Mapper
+@Component
+public interface YangChengTongrMapper extends BaseMapper<YangChengTong> {
+
+
+}