Merge remote-tracking branch 'origin/master'

apply-net/pom.xml

@@ -15,6 +15,11 @@
 
     <dependencies>
         <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.9.2</version>
+        </dependency>
+        <dependency>
             <groupId>com.winsun.framework</groupId>
             <artifactId>winsun-core-message</artifactId>
             <version>${winsun-framework.version}</version>

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

@@ -197,7 +197,7 @@ public class Order implements Serializable{
 	/**
 	 * 提交佣金系统次数
 	 */
-	private int yjCount;
+	private String yjCount;
 
 	/**
 	 * 提交佣金系统结果
@@ -207,12 +207,12 @@ public class Order implements Serializable{
 	/**
 	 * 新用户提交方式0督导1本人
 	 */
-	private int tjType;
+	private String tjType;
 
 	/**
 	 * 小白卡1单移 2融合
 	 */
-	private int xbType;
+	private String xbType;
 
 	/**
 	 * 宽带账号

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

@@ -27,7 +27,7 @@ public class Constant {
     	public final static String ZHANGSHIKEY = "3df143292455bfea88bc613c53004d36";	//智能平台提供的正式key
 //	public final static String ZHENGSHIAUCCON = "xiaoykd";	//智能平台提供的正式账号
 //	public final static String ZHANGSHIKEY = "d345040accff0421d03f760a03e5cbd9";	//智能平台提供的正式key
-	public final static String ZHANGSHIURL = "https://ismart.mini189.cn/api/";	//智能平台提供的正式key
+	public final static String ZHANGSHIURL = "https://ismartbak.mini189.cn/api/";	//智能平台提供的正式key
 	public final static String PRODUCTCATEGORY = "单宽带";	//只能平台提供的key
 //	public final static String TOMCATURL = "http://183.57.78.132:8080";	//Linux外网服务器地址
 //	public final static String INTRANETURL = "http://10.3.1.21:8080";	//Linux内网服务器地址
@@ -39,8 +39,8 @@ public class Constant {
 //	public final static String INTRANETURL = "http://127.0.0.1:8080";	//服务器地址
 	public final static String PRODUCTSKU481 = "481";	//产品sku:校园宽带300元/年
 	public final static String PRODUCTSKU479 = "479";	//产品sku:校园宽带30元/月
-	public final static String PRODUCTSKU479Str = "30元";	//产品sku:校园宽带30元/月
-	public final static String PRODUCTSKU481Str = "300元";	//产品sku:校园宽带30元/月
+	public final static String PRODUCTSKU479Str = "30";	//产品sku:校园宽带30元/月
+	public final static String PRODUCTSKU481Str = "300";	//产品sku:校园宽带30元/月
 	public final static String Payment0 = "0";	//支付方式：为翼支付网厅
 	public final static String Payment1 = "1";	//支付方式：为支付宝
 	public final static String Payment3 = "3";	//支付方式：为微信支付

common/src/main/java/com/winsun/utils/BeanUtil.java

+package com.winsun.utils;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 判断bean，数组，集合是否为空
+ * 
+ * @author liujianhao
+ *
+ */
+public class BeanUtil {
+
+	public static boolean isBlank(Object obj) {
+		if (obj == null) {
+			return true;
+		}
+		return false;
+	}
+
+	public static boolean isBlank(List<?> list) {
+		if (list == null || list.size() <= 0) {
+			return true;
+		}
+		return false;
+	}
+
+	public static boolean isBlank(Map<?, ?> map) {
+		if (map == null || map.size() <= 0) {
+			return true;
+		}
+		return false;
+	}
+
+	public static boolean isBlank(Object[] obj) {
+		if (obj == null || obj.length <= 0) {
+			return true;
+		}
+		return false;
+	}
+
+	public static boolean isNotBlank(Object obj) {
+		return !isBlank(obj);
+	}
+
+	public static boolean isNotBlank(List<?> list) {
+		return !isBlank(list);
+	}
+
+	public static boolean isNotBlank(Map<?, ?> map) {
+		return !isBlank(map);
+	}
+
+	public static boolean isNotBlank(Object[] obj) {
+		return !isBlank(obj);
+	}
+
+}

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

@@ -202,14 +202,18 @@ public class PackageNewClothes {
         order.setHehuorenArea(sysUser.getSubstName());
         order.setHehuorenName(sysUser.getName());
         String schoolId = appMapper.selectSchoolId(partner);
-        String schoolName = appMapper.selectSchoolById(schoolId);
-        order.setHehuorenSchool(schoolName);
+        School school=schoolMapper.selectById(schoolId);
+        order.setHehuorenSchool(school.getSchoolName());
         order.setHehuorenPhone(sysUser.getPhone());
+        List<String> userId = appMapper.selectsupervisorBySchool(schoolId);
+        SysUser user = userMapper.selectById(userId.get(0));
+        order.setSupervisorName(user.getName());
+        order.setLzgh(school.getLzgh());
         Integer insert = orderMapper.insert(order);
         // MessageUtil.sent(contactNumber,"4","");
 
         if (insert == 1) {
-            appMapper.inserOrderHis(id, "资料已提交", date, sysUser.getName());
+            appMapper.inserOrderHis(id, "资料已提交", date, customerName);
             return ResponseData.success(id);
         }
         return ResponseData.error("开卡失败！");
@@ -305,13 +309,17 @@ public class PackageNewClothes {
         order.setHehuorenArea(sysUser.getSubstName());
         order.setHehuorenName(sysUser.getName());
         String schoolId = appMapper.selectSchoolId(partner);
-        String schoolName = appMapper.selectSchoolById(schoolId);
-        order.setHehuorenSchool(schoolName);
+        School school=schoolMapper.selectById(schoolId);
+        order.setHehuorenSchool(school.getSchoolName());
         order.setHehuorenPhone(sysUser.getPhone());
+        List<String> userId = appMapper.selectsupervisorBySchool(schoolId);
+        SysUser user = userMapper.selectById(userId.get(0));
+        order.setSupervisorName(user.getName());
+        order.setLzgh(school.getLzgh());
         Integer insert = orderMapper.insert(order);
         // MessageUtil.sent(contactNumber,"4","");
         if (insert == 1) {
-            appMapper.inserOrderHis(id, "资料已提交", date, sysUser.getName());
+            appMapper.inserOrderHis(id, "资料已提交", date, customerName);
             return ResponseData.success(id);
         }
         return ResponseData.error("开卡失败！");
@@ -401,7 +409,7 @@ public class PackageNewClothes {
         order.setOrderStatus("待识别");
         order.setUserSchool(userSchool);
         order.setHehuorenId(partner);
-        order.setXbType(1);
+        order.setXbType("1");
         if(StringUtils.isNotBlank(site)){
             order.setSite(site);
         }
@@ -434,7 +442,7 @@ public class PackageNewClothes {
         // MessageUtil.sent(contactNumber,"4","");
 
         if (insert == 1) {
-            appMapper.inserOrderHis(id, "资料提交成功,等待上传证件", date, sysUser.getName());
+            appMapper.inserOrderHis(id, "资料提交成功,等待上传证件", date, customerName);
             return ResponseData.success(map.get("orderCode").toString());
         }
         return ResponseData.error("开卡失败！");

old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java

@@ -343,7 +343,7 @@ public class PackageUpgradeController extends BaseController {
         order.setHehuorenSchool(schoolName);
         order.setHehuorenPhone(sysUser.getPhone());
         Integer insert = orderMapper.insert(order);
-        appMapper.inserOrderHis(id, "下单成功", date, sysUser.getName());
+        appMapper.inserOrderHis(id, "下单成功", date,customerName);
         // MessageUtil.sent(contactNumber,"4","");
         if (StringUtils.isNotBlank(mark)) {
             String uuid1 = UUID.randomUUID().toString();
@@ -365,7 +365,7 @@ public class PackageUpgradeController extends BaseController {
             yangChengTong.setCustomerPhone(businessNumber);
             yangChengTong.setCustomerName(customerName);
             insert += yangChengTongrMapper.insert(yangChengTong);
-            appMapper.inserOrderHis(id1, "下单成功", date, sysUser.getName());
+            appMapper.inserOrderHis(id1, "下单成功", date, customerName);
             return ResponseData.success(id + ":" + id1, "下单成功！");
         }
         if (insert == 1) {

order/src/main/java/com/winsun/bean/Step.java

@@ -50,6 +50,7 @@ public class Step {
     /**
      * 下一步骤的流程ID主键
      * 主要描述情况 A，不归属完成
+     * 如果当前数据的值为空（null or ""）代表当前流程没 A 分支
      */
     private String selectA;
 
@@ -61,6 +62,7 @@ public class Step {
     /**
      * 下一步骤的流程ID主键
      * 主要描述情况 B，不归属完成
+     * 如果当前数据的值为空（null or ""）代表当前流程没 B 分支
      */
     private String selectB;
 
@@ -72,6 +74,7 @@ public class Step {
     /**
      * 下一步骤的流程ID主键
      * 主要描述当前流程完成
+     * 如果当前数据的值为空（null or ""）当做下一步结束处理（也就是当前节点就是流程终点）
      */
     private String selectNext;
 

order/src/main/java/com/winsun/constant/FormState.java

+package com.winsun.constant;
+
+/**
+ * @author Liph
+ * @datetime 2020-04-20/4/2 17:28
+ */
+public enum FormState {
+    /**
+     * 表单状态枚举
+     */
+    ENABLE("0", "禁用"), DISABLE("10000", "启用");
+
+    FormState(String id, String name) {
+        this.id = id;
+        this.name = name;
+    }
+
+    private String id;
+
+    private String name;
+
+    public String getId() {
+        return id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    /**
+     * 根据ID获取状态枚举
+     * @param id    状态ID
+     * @return
+     */
+    public static FormState findById(String id) {
+        for(FormState state : values()) {
+            if(state.getId().equals(id)) {
+                return state;
+            }
+        }
+        return null;
+    }
+}

order/src/main/java/com/winsun/controller/FormController.java

+package com.winsun.controller;
+
+import com.winsun.auth.core.common.model.ResponseData;
+import com.winsun.bean.Form;
+import com.winsun.mapper.FormMapper;
+import org.springframework.beans.factory.annotation.Autowired;
+
+/**
+ * 用于作为表单的创建、信息返回等使用
+ * @author Liph
+ * @datetime 2020-04-20/4/2 17:17
+ */
+public class FormController {
+    private static FormMapper formMapper;
+
+    @Autowired
+    public FormController(FormMapper formMapper) {
+        FormController.formMapper = formMapper;
+    }
+
+    public ResponseData<Form> list() {
+        return ResponseData.error(null);
+    }
+
+    public ResponseData<Form> creat() {
+        return ResponseData.error(null);
+    }
+
+    public ResponseData<Form> modify() {
+        return ResponseData.error(null);
+    }
+
+    public ResponseData<Form> delete() {
+        return ResponseData.error(null);
+    }
+
+    public ResponseData<Form> disable() {
+        return ResponseData.error(null);
+    }
+
+    public ResponseData<Form> enable() {
+        return ResponseData.error(null);
+    }
+}

order/src/main/java/com/winsun/mapper/FormMapper.java

+package com.winsun.mapper;
+
+import com.baomidou.mybatisplus.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author Liph
+ * @datetime 2020-04-20/4/2 17:26
+ */
+@Mapper
+public interface FormMapper extends BaseMapper<FormMapper> {
+}