修改融合controller类

apply-net/src/main/java/com/winsun/controller/RongHeController.java

@@ -9,7 +9,11 @@ import com.winsun.bean.*;
 import com.winsun.constant.Constant;
 import com.winsun.constant.Constant;
 import com.winsun.constant.OrderStatus;
 import com.winsun.constant.OrderStatus;
 import com.winsun.mapper.*;
 import com.winsun.mapper.*;
-import com.winsun.utils.*;
+import com.winsun.smsUtils.SendSmsAndMail;
+import com.winsun.utils.BeanUtil;
+import com.winsun.utils.MD5Utils;
+import com.winsun.utils.MyBatisPlusUpdateUtils;
+import com.winsun.utils.ProduceIdUtil;
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpEntity;
@@ -30,6 +34,7 @@ import org.springframework.web.bind.annotation.*;
 
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
 import java.io.UnsupportedEncodingException;
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
 import java.net.URLEncoder;
 import java.text.SimpleDateFormat;
 import java.text.SimpleDateFormat;
@@ -64,6 +69,38 @@ public class RongHeController {
     private OrderHistoryMapper historyMapper;
     private OrderHistoryMapper historyMapper;
     @Autowired
     @Autowired
     private SysUserMapper sysUserMapper;
     private SysUserMapper sysUserMapper;
+    private static String verifyCode = "";
+
+    @ResponseBody
+    @RequestMapping(value = "rhSendCodes", method = RequestMethod.POST)
+    public ResponseData<Map<String, Object>> rhSendCodes(String phone,HttpServletRequest request) {
+        Map<String, Object> map = new HashMap<>();
+        HttpSession session = request.getSession();
+        //随机生成六位数字验证码
+        String vCode = String.valueOf((int) (Math.random() * 900000 + 100000));
+        //第一次发送验证码
+        session.setAttribute("currentDate", System.currentTimeMillis());//Session放入当前系统时间
+        long currentDate = (Long) session.getAttribute("currentDate");
+        Long date = (Long) session.getAttribute("date");
+        //12小时内若发送验证码，currentDate的值则变成当前系统时间替换第一次发送验证码存入的时间，
+        // 并获取第一次的date相减，两次验证码发送时间相隔不超过一分钟，不允许持续发送
+        if (date != null && currentDate - date < 1000 * 60 * 60 * 12) {
+            map.put("errorState", "验证码发送未超过12小时");
+            map.put("verifyCode", session.getAttribute("verifyCode"));
+            return ResponseData.success(map);
+        }
+        session.setAttribute("date", System.currentTimeMillis());//Session放入当前系统时间
+        session.setAttribute("phoneNum", phone);//Session放入手机号码
+        session.setAttribute("verifyCode", vCode);//Session放入验证码
+        if("".equals(verifyCode)){
+            SendSmsAndMail.sendSms(phone,vCode+"","7");
+            verifyCode = vCode;
+        }
+        log.info(verifyCode);
+        map.put("verifyCode", verifyCode);
+        map.put("success", "验证码已发送");
+        return ResponseData.success(map);
+    }
 
 
     /**
     /**
      * 跟据合伙人id查找融合套餐信息
      * 跟据合伙人id查找融合套餐信息
@@ -435,10 +472,8 @@ public class RongHeController {
         }
         }
         //单宽回调后端接口地址
         //单宽回调后端接口地址
         //  map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser");
         //  map.put("BACKDROPURL", Constant.TOMCATURL + "/dankuan/toSubmisOrderPreser");
-
         map.put("BACKDROPURL", "http://yrym.winsun-aly.com/gdtel-xyzx-hhr/paymentCon/toSubmisOrderPreser.do");
         map.put("BACKDROPURL", "http://yrym.winsun-aly.com/gdtel-xyzx-hhr/paymentCon/toSubmisOrderPreser.do");
 
 
-
         String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.KEY;//商户标识
         String str = "ORDERSEQ=" + orderView.getOrderSeq() + "&ORDERDATE=" + ft.format(orderdate) + "&ORDERAMOUNT=" + orderView.getWebOrderAmount() + "&KEY=" + Constant.KEY;//商户标识
         //*	将值转换为大写	*//*
         //*	将值转换为大写	*//*
         map.put("MAC", MD5Utils.md5(str).toUpperCase());
         map.put("MAC", MD5Utils.md5(str).toUpperCase());