下单判断修复

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

@@ -32,7 +32,7 @@ public class XbkUtil {
         JSONObject json = new JSONObject(mapParm);
         JSONObject jsonObject = null;
         try {
-            jsonObject = HttpHelper.doPost("http://enter.gd189.cn:9090/o2oweb/outMain/service.do", json.toString());
+            jsonObject = HttpHelper.doPost("http://enter.gd189.cn/o2oweb/outMain/service.do", json.toString());
         }catch (Exception e){
             log.error(type+"调取接口异常",e.getMessage());
         }

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

@@ -76,6 +76,21 @@ public class PackageNewClothes {
         return ResponseData.success(packages);
     }
 
+
+    @RequestMapping(value = "checkHhr", method = RequestMethod.POST)
+    public ResponseData<String> checkHhr(@RequestParam("id") String id) {
+
+        if(StringUtils.isNotBlank(id)){
+            Wrapper<SysUser> wrapper = new EntityWrapper();
+            wrapper.eq("id",id);
+            Integer integer = userMapper.selectCount(wrapper);
+            if (integer>0){
+                return ResponseData.success();
+            }
+        }
+        return ResponseData.error("找不到该合伙人");
+    }
+
     /**
      * 手机号码获取 JT0001
      *
@@ -85,7 +100,7 @@ public class PackageNewClothes {
      * @return
      */
     @RequestMapping(value = "getNumber", method = RequestMethod.POST)
-    public ResponseData<JSONObject> getNumber(@RequestParam("cardId") String cardId, @RequestParam("partner") String partner, @RequestParam(value = "contNumber", required = false) String contNumber) {
+    public ResponseData<List<String>> getNumber(@RequestParam("cardId") String cardId, @RequestParam("partner") String partner, @RequestParam(value = "contNumber", required = false) String contNumber) {
         Package aPackage = packageMapper.selectById(cardId);
         String schoolId = appMapper.selectSchoolId(partner);
         School school = schoolMapper.selectById(schoolId);
@@ -98,10 +113,17 @@ public class PackageNewClothes {
             log.error("JT0001获取手机号码接口异常", e.getMessage());
             ResponseData.error("手机号码获取失败，请重新获取。");
         }
+        List<String> list = new ArrayList<>();
         if (!"0".equals(jsonObject.getString("code"))) {
             return ResponseData.error(jsonObject.getString("msg"));
+        }else{
+            List<Map<String,Object>> dataArray = (List<Map<String, Object>>) jsonObject.get("dataArray");
+            for (Map<String, Object> map : dataArray) {
+                String phoneNumber = map.get("phoneNumber").toString();
+                list.add(phoneNumber);
             }
-        return ResponseData.success(jsonObject);
+        }
+        return ResponseData.success(list);
     }
 
 
@@ -159,18 +181,30 @@ public class PackageNewClothes {
         if(!IDCardUtil.IDCardValidate(idCard)){
             return ResponseData.error("您的身份证输入有误，请重新输入！");
         }
+        /**
+         * 办理中+94天内订单判断
+         */
         Calendar instance = Calendar.getInstance();
         instance.add(Calendar.DATE, -94);
         Date time = instance.getTime();
         Wrapper<Order> wrapper = new EntityWrapper();
         wrapper.eq("id_card",idCard);
-        wrapper.gt("create_time", time);
         wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName()).and().ne("order_status", OrderStatus.SUCCESSFULDISTRIBUTION.getName());
         wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
         List<Order> orders = orderMapper.selectList(wrapper);
         if (orders.size() != 0) {
-            return ResponseData.error("您已经存在新开卡的订单，不能再重复开卡！");
+            return ResponseData.error("您已经存在办理中的新开卡的订单，不能再重复开卡！");
+        }
+        wrapper = new EntityWrapper();
+        wrapper.eq("id_card",idCard);
+        wrapper.gt("create_time", time);
+        wrapper.eq("order_status", OrderStatus.SUCCESSFULDISTRIBUTION.getName());
+        wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
+        orders = orderMapper.selectList(wrapper);
+        if (orders.size() != 0) {
+            return ResponseData.error("您94天内已经存在新开卡的订单，不能再重复开卡！");
         }
+
         SysUser sysUser = userMapper.selectById(partner);
         Order order = new Order();
         String uuid = UUID.randomUUID().toString();
@@ -268,18 +302,32 @@ public class PackageNewClothes {
         if(!IDCardUtil.IDCardValidate(idCard)){
             return ResponseData.error("您的身份证输入有误，请重新输入！");
         }
+
+        /**
+         * 办理中+94天内订单判断
+         */
         Calendar instance = Calendar.getInstance();
         instance.add(Calendar.DATE, -94);
         Date time = instance.getTime();
         Wrapper<Order> wrapper = new EntityWrapper();
         wrapper.eq("id_card",idCard);
-        wrapper.gt("create_time", time);
         wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName()).and().ne("order_status", OrderStatus.SUCCESSFULDISTRIBUTION.getName());
         wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
         List<Order> orders = orderMapper.selectList(wrapper);
         if (orders.size() != 0) {
-            return ResponseData.error("您已经存在新开卡的订单，不能再重复开卡！");
+            return ResponseData.error("您已经存在办理中的新开卡的订单，不能再重复开卡！");
         }
+        wrapper = new EntityWrapper();
+        wrapper.eq("id_card",idCard);
+        wrapper.gt("create_time", time);
+        wrapper.eq("order_status", OrderStatus.SUCCESSFULDISTRIBUTION.getName());
+        wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
+        orders = orderMapper.selectList(wrapper);
+        if (orders.size() != 0) {
+            return ResponseData.error("您94天内已经存在新开卡的订单，不能再重复开卡！");
+        }
+
+
         SysUser sysUser = userMapper.selectById(partner);
         Order order = new Order();
         String uuid = UUID.randomUUID().toString();
@@ -355,6 +403,32 @@ public class PackageNewClothes {
             , @RequestParam("customerName") String customerName, @RequestParam("partner") String partner, @RequestParam("businessNumber") String businessNumber
             , @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin
             , @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool, @RequestParam(value = "isFromRh", required = false) String isFromRh) {
+
+        /**
+         * 办理中+94天内订单判断
+         */
+        Calendar instance = Calendar.getInstance();
+        instance.add(Calendar.DATE, -94);
+        Date time = instance.getTime();
+        Wrapper<Order> wrapper = new EntityWrapper();
+        wrapper.eq("id_card",idCard);
+        wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName()).and().ne("order_status", OrderStatus.SUCCESSFULDISTRIBUTION.getName());
+        wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
+        List<Order> orders = orderMapper.selectList(wrapper);
+        if (orders.size() != 0) {
+            return ResponseData.error("您已经存在办理中的新开卡的订单，不能再重复开卡！");
+        }
+        wrapper = new EntityWrapper();
+        wrapper.eq("id_card",idCard);
+        wrapper.gt("create_time", time);
+        wrapper.eq("order_status", OrderStatus.SUCCESSFULDISTRIBUTION.getName());
+        wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
+        orders = orderMapper.selectList(wrapper);
+        if (orders.size() != 0) {
+            return ResponseData.error("您94天内已经存在新开卡的订单，不能再重复开卡！");
+        }
+
+
         if (contactNumber.length() != 11) {
             return ResponseData.error("联系号码有误，请重新输入");
         }
@@ -394,18 +468,8 @@ public class PackageNewClothes {
             return ResponseData.error("小白卡下单失败,如有疑问请联系客服,谢谢。");
         }
         Map map = JSON.parseObject(jsonObject.getString("dataArray"), HashMap.class);
-        Calendar instance = Calendar.getInstance();
-        instance.add(Calendar.DATE, -94);
-        Date time = instance.getTime();
-        Wrapper<Order> wrapper = new EntityWrapper();
-        wrapper.eq("id_card",idCard);
-        wrapper.gt("create_time", time);
-        wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName()).and().ne("order_status", OrderStatus.SUCCESSFULDISTRIBUTION.getName());
-        wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
-        List<Order> orders = orderMapper.selectList(wrapper);
-        if (orders.size() != 0) {
-            return ResponseData.error("您已经存在新开卡的订单，不能再重复开卡！");
-        }
+
+
         SysUser sysUser = userMapper.selectById(partner);
         Order order = new Order();
         String uuid = UUID.randomUUID().toString();
@@ -447,7 +511,6 @@ public class PackageNewClothes {
         order.setLzgh(school.getLzgh());
         Integer insert = orderMapper.insert(order);
         // MessageUtil.sent(contactNumber,"4","");
-
         if (insert == 1) {
             appMapper.inserOrderHis(id, "资料提交成功,等待上传证件", date, customerName);
             if(StringUtils.isNotEmpty(isFromRh)){

service-manager/src/main/java/com/winsun/controller/OrderController.java

 package com.winsun.controller;
 
-import java.io.*;
-import java.net.URLEncoder;
-import java.time.LocalDate;
-import java.util.*;
-
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-
 import com.alibaba.excel.EasyExcel;
 import com.alibaba.excel.ExcelWriter;
 import com.alibaba.excel.support.ExcelTypeEnum;
 import com.alibaba.excel.write.metadata.WriteSheet;
 import com.alibaba.fastjson.JSON;
-import com.winsun.auth.core.util.DateUtil;
-import com.winsun.bean.*;
-import com.winsun.mapper.*;
-import com.winsun.rabbitmq.RabbitProducer;
-import com.winsun.utils.ImportExcel;
-import com.winsun.utils.MyBatisPlusUpdateUtils;
-import com.winsun.utils.YrymReportUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.util.CellRangeAddressList;
-import org.apache.poi.xssf.usermodel.*;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-
 import com.baomidou.mybatisplus.enums.SqlLike;
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
@@ -36,11 +14,35 @@ import com.winsun.auth.core.base.controller.BaseController;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.auth.core.shiro.ShiroUser;
 import com.winsun.auth.core.util.IOUtils;
-import com.winsun.constant.OrderStatus;
-
+import com.winsun.bean.Order;
+import com.winsun.bean.School;
+import com.winsun.bean.SysUser;
+import com.winsun.bean.YrymReport;
+import com.winsun.mapper.*;
+import com.winsun.rabbitmq.RabbitProducer;
+import com.winsun.utils.ImportExcel;
+import com.winsun.utils.MyBatisPlusUpdateUtils;
+import com.winsun.utils.YrymReportUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.usermodel.HorizontalAlignment;
+import org.apache.poi.ss.util.CellRangeAddressList;
+import org.apache.poi.xssf.usermodel.*;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.time.LocalDate;
+import java.util.*;
+
 /**
  * @Author: dongyp
  * @Date: 2020/2/14 17:08
@@ -199,7 +201,7 @@ public class OrderController extends BaseController {
         wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);
         wrapper.eq(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
         wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT);
-        wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus);
+        wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus).orderBy("create_time",false);
 
         Page<Order> page = new Page<>(pageNo, pageSize);
         List<Order> aPackage = orderMapper.selectPage(page, wrapper);