融合套餐提交订单，另外有去掉了orderView实体类的get,set;改为注入

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

 package com.winsun.bean;
 
+import com.baomidou.mybatisplus.annotations.TableField;
 import com.baomidou.mybatisplus.annotations.TableId;
 import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
@@ -26,311 +27,127 @@ public class OrderView implements Serializable {
     /**
     * 订单号码
     */
-    private String orderseq;
+    @TableField(value = "orderSeq")
+    private String orderSeq;
     /**
     * 产品名称
     */
-    private String productname;
+    @TableField(value = "productName")
+    private String productName;
     /**
     * 套餐
     */
+    @TableField(value = "order_set_meal")
     private String orderSetMeal;
     /**
     * 学校
     */
+    @TableField(value = "order_university_name")
     private String orderUniversityName;
     /**
     * 姓名
     */
-    private String ordername;
+    @TableField(value = "orderName")
+    private String orderName;
     /**
     * 提交时间
     */
-    private Date orderdate;
+    @TableField(value = "orderDate")
+    private Date orderDate;
     /**
     * 订单状态
     */
+    @TableField(value = "status")
     private String status;
     /**
     * 区域
     */
+    @TableField(value = "order_region")
     private String orderRegion;
     /**
     * 支付平台：翼支付网厅|支付宝|微信
     */
-    private String ipay;
+    @TableField(value = "ipay")
+    private String iPay;
     /**
     * 支付方式：电脑支付|手机WAY支付|微信扫码支付|公众号支付|支付宝扫码
     */
-    private String paytype;
+    @TableField(value = "payType")
+    private String payType;
     /**
     * 产品价格
     */
-    private String weborderamount;
+    @TableField(value = "webOrderAmount")
+    private String webOrderAmount;
     /**
     * 支付时间
     */
+    @TableField(value = "order_payment_time")
     private Date orderPaymentTime;
     /**
     * 穗易付订单号
     */
-    private String orderreqtranseq;
+    @TableField(value = "orderReqtranSeq")
+    private String orderReqtranSeq;
     /**
     * 接入商
     */
-    private String customerid;
+    @TableField(value = "customeRid")
+    private String customerId;
     /**
     * 联系电话
     */
-    private String orderphone;
+    @TableField(value = "orderPhone")
+    private String orderPhone;
     /**
     * 身份证号码
     */
-    private String ordernumber;
+    @TableField(value = "orderNumber")
+    private String orderNumber;
     /**
     * 用户类别
     */
+    @TableField(value = "order_customer_type")
     private String orderCustomerType;
     /**
     * 学生证号
     */
+    @TableField(value = "order_customer_student_id")
     private String orderCustomerStudentId;
     /**
     * 备注
     */
+    @TableField(value = "order_customer_remarks")
     private String orderCustomerRemarks;
     /**
     * 多媒体账号
     */
+    @TableField(value = "order_customer_account")
     private String orderCustomerAccount;
     /**
     * 多媒体密码
     */
+    @TableField(value = "order_customer_pwd")
     private String orderCustomerPwd;
     /**
     * 支付平台流水号
     */
+    @TableField(value = "uptranseq")
     private String uptranseq;
     /**
     * 用户显示的速率
     */
+    @TableField(value = "expenses")
     private String expenses;
     /**
     * 预留字段2
     */
+    @TableField(value = "order_rf2")
     private String orderRf2;
     /**
     * 智能平台订单号
     */
-    private String orderseqthd;
-
-
-    public Integer getOrderId() {
-        return orderId;
-    }
-
-    public void setOrderId(Integer orderId) {
-        this.orderId = orderId;
-    }
-
-    public String getOrderseq() {
-        return orderseq;
-    }
-
-    public void setOrderseq(String orderseq) {
-        this.orderseq = orderseq;
-    }
-
-    public String getProductname() {
-        return productname;
-    }
-
-    public void setProductname(String productname) {
-        this.productname = productname;
-    }
-
-    public String getOrderSetMeal() {
-        return orderSetMeal;
-    }
-
-    public void setOrderSetMeal(String orderSetMeal) {
-        this.orderSetMeal = orderSetMeal;
-    }
-
-    public String getOrderUniversityName() {
-        return orderUniversityName;
-    }
-
-    public void setOrderUniversityName(String orderUniversityName) {
-        this.orderUniversityName = orderUniversityName;
-    }
-
-    public String getOrdername() {
-        return ordername;
-    }
-
-    public void setOrdername(String ordername) {
-        this.ordername = ordername;
-    }
-
-    public Date getOrderdate() {
-        return orderdate;
-    }
-
-    public void setOrderdate(Date orderdate) {
-        this.orderdate = orderdate;
-    }
-
-    public String getStatus() {
-        return status;
-    }
-
-    public void setStatus(String status) {
-        this.status = status;
-    }
-
-    public String getOrderRegion() {
-        return orderRegion;
-    }
-
-    public void setOrderRegion(String orderRegion) {
-        this.orderRegion = orderRegion;
-    }
-
-    public String getIpay() {
-        return ipay;
-    }
-
-    public void setIpay(String ipay) {
-        this.ipay = ipay;
-    }
-
-    public String getPaytype() {
-        return paytype;
-    }
-
-    public void setPaytype(String paytype) {
-        this.paytype = paytype;
-    }
-
-    public String getWeborderamount() {
-        return weborderamount;
-    }
-
-    public void setWeborderamount(String weborderamount) {
-        this.weborderamount = weborderamount;
-    }
-
-    public Date getOrderPaymentTime() {
-        return orderPaymentTime;
-    }
-
-    public void setOrderPaymentTime(Date orderPaymentTime) {
-        this.orderPaymentTime = orderPaymentTime;
-    }
-
-    public String getOrderreqtranseq() {
-        return orderreqtranseq;
-    }
-
-    public void setOrderreqtranseq(String orderreqtranseq) {
-        this.orderreqtranseq = orderreqtranseq;
-    }
-
-    public String getCustomerid() {
-        return customerid;
-    }
-
-    public void setCustomerid(String customerid) {
-        this.customerid = customerid;
-    }
-
-    public String getOrderphone() {
-        return orderphone;
-    }
-
-    public void setOrderphone(String orderphone) {
-        this.orderphone = orderphone;
-    }
-
-    public String getOrdernumber() {
-        return ordernumber;
-    }
-
-    public void setOrdernumber(String ordernumber) {
-        this.ordernumber = ordernumber;
-    }
-
-    public String getOrderCustomerType() {
-        return orderCustomerType;
-    }
-
-    public void setOrderCustomerType(String orderCustomerType) {
-        this.orderCustomerType = orderCustomerType;
-    }
-
-    public String getOrderCustomerStudentId() {
-        return orderCustomerStudentId;
-    }
-
-    public void setOrderCustomerStudentId(String orderCustomerStudentId) {
-        this.orderCustomerStudentId = orderCustomerStudentId;
-    }
-
-    public String getOrderCustomerRemarks() {
-        return orderCustomerRemarks;
-    }
-
-    public void setOrderCustomerRemarks(String orderCustomerRemarks) {
-        this.orderCustomerRemarks = orderCustomerRemarks;
-    }
-
-    public String getOrderCustomerAccount() {
-        return orderCustomerAccount;
-    }
-
-    public void setOrderCustomerAccount(String orderCustomerAccount) {
-        this.orderCustomerAccount = orderCustomerAccount;
-    }
-
-    public String getOrderCustomerPwd() {
-        return orderCustomerPwd;
-    }
-
-    public void setOrderCustomerPwd(String orderCustomerPwd) {
-        this.orderCustomerPwd = orderCustomerPwd;
-    }
-
-    public String getUptranseq() {
-        return uptranseq;
-    }
-
-    public void setUptranseq(String uptranseq) {
-        this.uptranseq = uptranseq;
-    }
-
-    public String getExpenses() {
-        return expenses;
-    }
-
-    public void setExpenses(String expenses) {
-        this.expenses = expenses;
-    }
-
-    public String getOrderRf2() {
-        return orderRf2;
-    }
-
-    public void setOrderRf2(String orderRf2) {
-        this.orderRf2 = orderRf2;
-    }
-
-    public String getOrderseqthd() {
-        return orderseqthd;
-    }
-
-    public void setOrderseqthd(String orderseqthd) {
-        this.orderseqthd = orderseqthd;
-    }
+    @TableField(value = "orderSeqTHD")
+    private String orderseqThd;
 
 }
\ No newline at end of file

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

@@ -6,16 +6,17 @@ import com.baomidou.mybatisplus.annotations.TableName;
 import com.baomidou.mybatisplus.enums.IdType;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 @TableName("sys_user")
 @Data
-public class SysUser {
+public class SysUser implements Serializable {
 
     /**
      * 主键
      */
-    @TableId(type = IdType.AUTO)
+    @TableId(value = "id",type = IdType.AUTO)
     private String id;
 
     /**

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

@@ -2,7 +2,6 @@ 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;
@@ -18,11 +17,10 @@ public class UserSchool implements Serializable {
     /**
      * 主键
      */
-    @TableId(value = "user_id", type = IdType.AUTO)
+    @TableId(value = "user_id")
      private String userId;
      /**
       *
       */
-     @TableId(value = "school_id")
       private String schoolId;
 }

new-user/src/main/java/com/winsun/controller/StartSelectController.java

@@ -74,40 +74,6 @@ public class StartSelectController {
     }
 
     /**
-     *跟据合伙人id查找融合套餐信息
-     * @param hhrId
-     * @return
-     */
-    @RequestMapping("/getTcInfoByHhrId")
-    public ResponseData<Map<String, Object>> getTcInfoByHhrId(@RequestParam("hhrId") String hhrId){
-        if (StringUtils.isEmpty(hhrId)){
-            return ResponseData.error("请输入合伙人id");
-        }
-        Map<String,Object> objMap = new HashMap<>();
-        Wrapper<UserSchool> usWrapper = new EntityWrapper<>();
-        usWrapper.setSqlSelect(" school_id AS schoolId ");
-        usWrapper.addFilter(" user_id = '" + hhrId +"'");
-        Map<String,Object> usMap = userSchoolMapper.selectMaps(usWrapper).get(0);
-
-        Wrapper<School> schoolWrapper = new EntityWrapper<>();
-        schoolWrapper.setSqlSelect(" id,sub_name AS subName,bandproduct_id AS bandproductId ");
-        schoolWrapper.addFilter(" id = '" + usMap.get("schoolId") +"'");
-        Map<String,Object> schoolMap = schoolMapper.selectMaps(schoolWrapper).get(0);
-
-        Wrapper<Product> productWrapper = new EntityWrapper<>();
-        productWrapper.setSqlSelect(" product_id,product_title,product_region,university_id ");
-        productWrapper.addFilter(" product_id = '" + schoolMap.get("bandproductId") +"'");
-        Map<String,Object> productMap = productMapper.selectMaps(productWrapper).get(0);
-        /*if (CollectionUtils.isEmpty(mapList)){
-            return ResponseData.error("没有查询相关的合伙人id的信息");
-        }
-        Map<String, Object> map = mapList.get(0);*/
-        objMap.put("userMap",usMap);
-        objMap.put("schoolMap",schoolMap);
-        objMap.put("productMap",productMap);
-        return ResponseData.success(objMap);
-    }
-    /**
      *通过学生ID，name和身份证查询学生信息
      * @param stuId 学生ID
      * @param name 用户名
@@ -214,9 +180,7 @@ public class StartSelectController {
         JSONObject queryOrderJsonObject = null;
         if (StringUtils.isNotBlank(orderNum)) {
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
-
             Map<String, String> orderMap = new HashMap<>();
-            OrderView orderView = new OrderView();
             orderMap.put("orderSeq", orderSeq);
             orderMap.put("productTitle", "中国电信校园高速宽带");
             orderMap.put("order_set_meal", "毕业生融合套餐");
@@ -495,21 +459,21 @@ public class StartSelectController {
         log.info("支付操作后保存数据到数据库");
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         OrderView orderView = new OrderView();
-        orderView.setOrderseq(ProduceIdUtil.getId()+"");// 订单号码
-        orderView.setProductname(orderMap.get("productTitle"));    // 产品名称
+        orderView.setOrderSeq(ProduceIdUtil.getId()+"");// 订单号码
+        orderView.setProductName(orderMap.get("productTitle"));    // 产品名称
         orderView.setOrderSetMeal(orderMap.get("order_set_meal"));    // 套餐
         orderView.setOrderUniversityName(orderMap.get("order_university_name"));    // 学校
-        orderView.setOrdername(orderMap.get("orderName"));    // 姓名
+        orderView.setOrderName(orderMap.get("orderName"));    // 姓名
         String orderDatetime = orderMap.get("orderDatetime");
-        orderView.setOrderdate(df.parse(orderDatetime));    // 提交时间
+        orderView.setOrderDate(df.parse(orderDatetime));    // 提交时间
         orderView.setStatus(orderMap.get("Status"));    // 订单状态
         orderView.setOrderRegion(orderMap.get("universityRegion"));    // 区域
-        orderView.setIpay(orderMap.get("ipay"));    // 支付平台
-        orderView.setPaytype(orderMap.get("payType"));    // 支付方式
-        orderView.setWeborderamount(orderMap.get("prices").replace("元", ""));    // 产品价格
-        orderView.setCustomerid("xyzxyql");    // 接入商
-        orderView.setOrderphone(orderMap.get("orderPhone"));    // 联系电话
-        orderView.setOrdernumber(orderMap.get("orderNumber"));    // 身份证号码
+        orderView.setIPay(orderMap.get("ipay"));    // 支付平台
+        orderView.setPayType(orderMap.get("payType"));    // 支付方式
+        orderView.setWebOrderAmount(orderMap.get("prices").replace("元", ""));    // 产品价格
+        orderView.setCustomerId("xyzxyql");    // 接入商
+        orderView.setOrderPhone(orderMap.get("orderPhone"));    // 联系电话
+        orderView.setOrderNumber(orderMap.get("orderNumber"));    // 身份证号码
         if (StringUtils.isBlank(orderMap.get("order_customer_student_id"))) {
             orderView.setOrderCustomerType("老师");    // 用户类别
         } else {