修改毕业生融合

bc96b29f · 罗承锋 · 66855cba · bc96b29f · bc96b29f · bc96b29f
Commit bc96b29f authored Feb 08, 2021 by 罗承锋
5 changed files
--- a/common/src/main/java/com/winsun/mapper/OrderMapper.java
+++ b/common/src/main/java/com/winsun/mapper/OrderMapper.java
@@ -146,6 +146,7 @@ public interface OrderMapper extends BaseMapper<Order> {
     */
    int updateNosendAndRhTimeLtNowOrder();
+    @Select("select * from bys_student where phone = #{phone}")
+    List<Map<String, Object>> selectBys(String phone);
 }
--- a/new-user/src/main/java/com/winsun/controller/StartSelectController.java
+++ b/new-user/src/main/java/com/winsun/controller/StartSelectController.java
@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.winsun.auth.core.common.model.ResponseData;
 import com.winsun.bean.*;
 import com.winsun.mapper.*;
+import com.winsun.smsUtils.SendSmsAndMail;
 import com.winsun.utils.MD5Utils;
+import com.winsun.utils.MyBatisPlusUpdateUtils;
 import com.winsun.utils.ProduceIdUtil;
 import com.winsun.utils.RandomUtil;
 import lombok.extern.slf4j.Slf4j;
@@ -13,6 +15,7 @@ import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
 import org.apache.http.HttpResponse;
 import org.apache.http.NameValuePair;
 import org.apache.http.client.config.RequestConfig;
@@ -33,6 +36,7 @@ import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.util.*;
+import java.util.concurrent.TimeUnit;
 /**
 * @Author xuede
@@ -64,6 +68,8 @@ public class StartSelectController {
    @Autowired
    @Qualifier("redisStringTemplate")
    private RedisTemplate redisTemplate;
+    @Autowired
+    private OrderViewMapper orderViewMapper;
    /**
     * 查询学校信息
@@ -79,6 +85,31 @@ public class StartSelectController {
        return ResponseData.error("没有查询相关的合伙人id的信息！！！");
    }
+    @ResponseBody
+    @RequestMapping(value = "sendBysCodes", method = RequestMethod.POST)
+    public ResponseData<Map<String, Object>> checkStudent(String phone) {
+        Map<String, Object> map = new HashMap<>();
+        try {
+            List<Map<String, Object>> maps = orderMapper.selectBys(phone);
+            if (maps == null || map.size() == 0) {
+                return ResponseData.error("该号码不允许办理此业务。");
+            }
+//          生成6位随机数
+            int veCode = (int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000);
+            redisTemplate.opsForValue().set(phone, String.valueOf(veCode), 30, TimeUnit.MINUTES);
+            SendSmsAndMail.sendSms(phone,veCode + "","7");
+            log.info("验证码:" + veCode);
+            map.put("code",1);
+        } catch (Exception e) {
+            log.error("获取验证码异常:", e);
+            map.put("code",2);
+        }
+        return ResponseData.success(map);
+    }
    /**
     *通过学生ID，name和身份证查询学生信息
     * @param stuId 学生ID
@@ -123,6 +154,14 @@ public class StartSelectController {
        String currentTimeStr = simpleDateFormat.format(new Date());
        Map<String, String[]> parameterMap = request.getParameterMap();
+        // 身份证查重单
+        List<Order> orders = orderMapper.selectRepeatOrder(parameterMap.get("identification")[0]);
+        if (orders != null && orders.size() != 0) {
+            map.put("code", "1");
+            map.put("error", "已有重复订单");
+            return map;
+        }
        Map<String,String> maps = new HashMap<>();
        String orderSeq = ProduceIdUtil.getId().toString();
        maps.put("orderSeq",orderSeq);
@@ -187,25 +226,33 @@ public class StartSelectController {
            orderMap.put("ipay", "0");
            orderMap.put("payType", "1");
            orderMap.put("prices", "200");
+            orderMap.put("orderTHD", orderNum);
            orderMap.put("orderPhone", parameterMap.get("contactNumber")[0]);
            orderMap.put("orderNumber", parameterMap.get("identification")[0]);
            orderMap.put("expenses", "毕业生融合套餐");
            orderMap.put("upStatus", "2");
+            orderMap.put("site", parameterMap.get("myAddrs")[0].replace("/"," "));
+            orderMap.put("address", parameterMap.get("address")[0]);
            orderMap.put("partner", parameterMap.get("partner")[0]);
            /*	5、更新数据库   */
            saveOrderInfo(orderMap,"");
            map.put("orderSeq", orderSeq);
+        }else{
+            map.put("code", "1");
+            map.put("msg", submitOrderJsonObject.get("msg"));
        }
        return map;    // 不成功
    }
    private JSONObject getOrderBYSRHInfo(Map<String, String[]> parameterMap, String currentTimeStr, String productId, Map<String,String> objectMap) throws Exception {
        List<NameValuePair> qParams = new ArrayList<NameValuePair>();
-        //HttpHost proxy = new HttpHost("172.18.101.170", 3128);
+        HttpHost proxy = new HttpHost("172.18.101.170", 3128);
        RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(500000)
-                .setConnectTimeout(500000).setConnectionRequestTimeout(500000).build();
+                .setConnectTimeout(500000).setConnectionRequestTimeout(500000)
+                .setProxy(proxy).build();
        CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig)
                .build();
        HttpEntity entity = null;
        HttpPost httpPost = new HttpPost(Constant.ZHANGSHIURL + "create-order.action");
@@ -467,6 +514,9 @@ public class StartSelectController {
        orderView.setPayType(orderMap.get("payType"));    // 支付方式
        orderView.setWebOrderAmount(orderMap.get("prices").replace("元", ""));    // 产品价格
        orderView.setCustomerId("xyzxyql");    // 接入商
+        if (orderMap.get("orderTHD") != null) {
+            orderView.setOrderseqThd(orderMap.get("orderTHD").toString());
+        }
        orderView.setOrderPhone(orderMap.get("orderPhone"));    // 联系电话
        orderView.setOrderNumber(orderMap.get("orderNumber"));    // 身份证号码
        if (StringUtils.isBlank(orderMap.get("order_customer_student_id"))) {
@@ -479,6 +529,8 @@ public class StartSelectController {
        orderView.setOrderCustomerAccount(orderMap.get("order_customer_account"));    // 多媒体账号
        orderView.setOrderCustomerPwd(orderMap.get("order_customer_pwd"));    // 多媒体密码
+        orderViewMapper.insert(orderView);
        UserSchool userSchool = userSchoolMapper.selectById(orderMap.get("partner"));
        School school = schoolMapper.selectById(userSchool.getSchoolId());
        SysUser sysUser = sysUserMapper.selectById(userSchool.getUserId());
@@ -500,6 +552,7 @@ public class StartSelectController {
            order.setIdentifying(orderMap.get("identifying"));
            order.setCustomerName(orderMap.get("orderName"));
            order.setOrderStatus("审核中");
+            order.setBusinessNumber(orderMap.get("orderPhone"));
            order.setContactNumber(orderMap.get("orderPhone"));
            order.setIdCard(orderMap.get("orderNumber"));
            order.setExpenses(orderMap.get("expenses"));
@@ -522,7 +575,54 @@ public class StartSelectController {
            history.setStatus("资料已提交");
            historyMapper.insert(history);
        } else if (orderMap.get("upStatus").equals("2")) {
+            // 毕业生办理
+            Order order = new Order();
+            String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+            uuid = uuid.substring(1, 12);
+            order.setId(uuid);
+            SimpleDateFormat df2 = new SimpleDateFormat("yyyyMMdd");//设置日期格式
+            order.setOrderNumber("YRYM" + df2.format(new Date()) + (int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 1000));
+            order.setNetNumber(orderMap.get("order_customer_account"));
+            order.setNetPassword(orderMap.get("order_customer_pwd"));
+            order.setUserSchool(orderMap.get("order_university_name"));
+            order.setBusinessPackage("毕业生融合");
+            order.setHehuorenId(orderMap.get("partner"));
+            order.setKdOrderId(orderView.getOrderSeq());
+            order.setUserType("9");
+            if (orderMap.get("orderTHD") != null) {
+                order.setOrderId(orderMap.get("orderTHD").toString());
+            }
+            if (orderMap.get("address") != null) {
+                order.setAddress(orderMap.get("address").toString());
+            }
+            order.setSite(orderMap.get("site").toString());
+            order.setBusinessNumber("");
+            order.setCustomerName(orderMap.get("orderName"));
+            order.setOrderStatus("审核中");
+            order.setContactNumber(orderMap.get("orderPhone"));
+            order.setIdCard(orderMap.get("orderNumber"));
+            order.setExpenses("");
+            order.setIdentifying(orderMap.get("identifying"));
+            SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+            order.setCreateTime(new Date());
+            order.setThStatus(orderMap.get("Status"));
+            if (!school.equals(null)) {
+                order.setHehuorenArea(school.getSubName());
+                order.setHehuorenSchool(school.getSchoolName());
+                order.setLzgh(school.getLzgh());
+                order.setHehuorenName(sysUser.getName());
+                order.setHehuorenPhone(sysUser.getPhone());
+                order.setSupervisorName(sysUser.getName());
+            }
+            orderMapper.insert(order);
+            OrderHistory history = new OrderHistory();
+            history.setOrderId(uuid);
+            history.setCreateDate(new Date());
+            history.setStatus("资料已提交");
+            historyMapper.insert(history);
        } else {
            Order order = new Order();
            String uuid = UUID.randomUUID().toString().replaceAll("-", "");
@@ -568,9 +668,10 @@ public class StartSelectController {
    private JSONObject getSaleId(String productId, String currentTimeStr) throws Exception {
        List<NameValuePair> qParams = new ArrayList<NameValuePair>();
        Map<String, String> signMap = new HashMap<String, String>();//待签名参数
-        //HttpHost proxy = new HttpHost("172.18.101.170", 3128);
+        HttpHost proxy = new HttpHost("172.18.101.170", 3128);
        RequestConfig defaultRequestConfig = RequestConfig.custom().setSocketTimeout(500000)
-                .setConnectTimeout(500000).setConnectionRequestTimeout(500000).build();//.setProxy(proxy)
+                .setConnectTimeout(500000).setConnectionRequestTimeout(500000)
+                .setProxy(proxy).build();
        CloseableHttpClient httpclient = HttpClients.custom().setDefaultRequestConfig(defaultRequestConfig)
                .build();

--- a/service-manager/src/main/java/com/winsun/controller/ImgController.java
+++ b/service-manager/src/main/java/com/winsun/controller/ImgController.java
@@ -26,6 +26,7 @@ public class ImgController {
        request.getServletPath();
        String  imgurl= FilePath.BACKGROUNDIMG.getValue()+"/"+request.getServletPath();
        imgurl = imgurl.replace("//", "/");
        File file = new File(imgurl);
        FileInputStream inputStream = null;
        try {
@@ -40,6 +41,7 @@ public class ImgController {
            }
        } catch (Exception e) {
+            e.printStackTrace();
            log.error("图片下载失败",e.getMessage());
        }finally{
            if (inputStream != null) {

--- a/service-manager/src/main/java/com/winsun/controller/OrderController.java
+++ b/service-manager/src/main/java/com/winsun/controller/OrderController.java
@@ -463,7 +463,7 @@ public class OrderController extends BaseController {
    }
    /**
-     * 编辑订单
+     * 编辑宽带订单（超级管理员、县分管理员、修改身份证）
     *
     * @return
     */
@@ -474,6 +474,11 @@ public class OrderController extends BaseController {
                                          @RequestParam(value = "studentCard",required = false) String student_card,@RequestParam(value = "address",required = false) String address,
                                          @RequestParam(value = "site",required = false) String site, @RequestParam(value = "remarks",required = false) String remarks,@RequestParam(value = "orderStatus",required = false) String order_status) {
        ShiroUser user = getShiroUser();
+        if (!user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员", "县分管理员（订单）", "修改身份证"))) {
+            ResponseData.error("无权限修改订单");
+        }
        List<Map<String, Object>> hhrOrderId = orderMapper.findHhrOrderId(id);
        if(hhrOrderId.size()!=1){
            return ResponseData.error("无数据查询");

--- a/service-manager/src/main/java/com/winsun/service/impl/AccessStatisticServiceImpl.java
+++ b/service-manager/src/main/java/com/winsun/service/impl/AccessStatisticServiceImpl.java
@@ -145,7 +145,7 @@ public class AccessStatisticServiceImpl implements AccessStatisticService {
        }
        log.info("统计用户：" + userIdsDql.toString());
-        String dql = "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"range\":{\"@timestamp\":{\"gte\":" + startDate.getTime() + ",\"lte\":" + endDate.getTime() +",\"format\":\"epoch_millis\"}}},{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"agent.hostname:\\\"ESC-NETWORK\\\" AND request:*.do* " + userIdsDql.toString() + "\"}}]}},\"aggs\":{\"groupBy\": {\"date_histogram\": {\"field\": \"@timestamp\",\"interval\": \"" + type + "\"},\"aggs\":{\"userCount\":{\"cardinality\":{\"field\":\"remote_addr\"}}}}}}";
+        String dql = "{\"size\":0,\"query\":{\"bool\":{\"filter\":[{\"range\":{\"@timestamp\":{\"gte\":" + startDate.getTime() + ",\"lte\":" + endDate.getTime() +",\"format\":\"epoch_millis\"}}},{\"query_string\":{\"analyze_wildcard\":true,\"query\":\"request:*.do* " + userIdsDql.toString() + "\"}}]}},\"aggs\":{\"groupBy\": {\"date_histogram\": {\"field\": \"@timestamp\",\"interval\": \"" + type + "\"},\"aggs\":{\"userCount\":{\"cardinality\":{\"field\":\"remote_addr\"}}}}}}";
        log.info("dql：" + dql);
        try {
            String esSearch = AccessStatisticDataSearchUtils.esSearch(dql);