Merge remote-tracking branch 'origin/master'

common/src/main/java/com/winsun/mapper/AppMapper.java

@@ -52,4 +52,7 @@ public interface AppMapper extends BaseMapper<PackageUpgrade> {
             " </script>")
     List<String> selectUserBySchool(@Param("schoolIds") List<String> schoolIds);
 
+
+    @Select("select * from hhr_ycsll_yrym_list where acc_nbr = #{acc_nbr}")
+    List<Map<String,Object>> selectYCSLL(@Param("acc_nbr") String acc_nbr);
 }

common/src/main/java/com/winsun/mapper/OrderMapper.java

@@ -8,6 +8,7 @@ import com.winsun.bean.Order;
 import com.winsun.bean.OrderView;
 import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.Date;
 import java.util.List;
@@ -149,4 +150,9 @@ public interface OrderMapper extends BaseMapper<Order> {
     @Select("select * from bys_student where phone = #{phone}")
     List<Map<String, Object>> selectBys(String phone);
 
+    /**
+     * 查询是否存在预存送流量订单
+     * */
+    @Select("SELECT * FROM hhr_order WHERE contact_number = #{phone} and business_package = '预存送流量'")
+    List<Map<String, Object>> selectOrderYcsll(@Param("phone") String phone);
 }

common/src/main/java/com/winsun/mapper/SysUserMapper.java

@@ -2,12 +2,12 @@ package com.winsun.mapper;
 
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.winsun.bean.SysUser;
-import org.apache.ibatis.annotations.Insert;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Options;
-import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.*;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 用户表的Mapper
  */
@@ -17,4 +17,11 @@ public interface SysUserMapper extends BaseMapper<SysUser> {
 
     @Insert("insert into `hhr_user_school` (user_id,school_id) values(#{userId},#{schoolId})")
     Integer insertUserSchool(@Param("userId")String userId,@Param("schoolId")String schoolId);
+
+    @Select("SELECT s.id id,s.name name,s.account account,hs.school_name school,hs.sub_name area \n" +
+            "FROM sys_user s,hhr_user_school hus,hhr_school hs\n" +
+            "where s.id = hus.user_id\n" +
+            "and hus.school_id = hs.id\n" +
+            "and s.id = #{id} ")
+    List<Map<String,Object>> findPartnerById(@Param("id")String id);
 }

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

@@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -111,6 +112,7 @@ public class PackageUpgradeController extends BaseController {
             objMap.put("isBys", false);
             //查找存量表是否存在
             List<Map<String, Object>> packageUpgrade = appMapper.selectMaps(wrapper);
+            List<Map<String,Object>> packageYCSLL = appMapper.selectYCSLL(selectOrder);
             String nbr = null;
             if (packageUpgrade.size() > 0) {
                 nbr = packageUpgrade.get(0).get("acc_nbr").toString();
@@ -121,6 +123,18 @@ public class PackageUpgradeController extends BaseController {
                 }
                 objMap.put("count", packageUpgrade.size());
                 objMap.put("data", packageUpgrade);
+                objMap.put("isYcsll",false);
+            }else if (packageYCSLL.size() > 0){
+                nbr = packageYCSLL.get(0).get("acc_nbr").toString();
+                for (Map<String, Object> map : packageYCSLL) {
+                    map.put("acc_nbr", map.get("acc_nbr").toString().substring(0, 3) + "****" + map.get("acc_nbr").toString().substring(7, 11));
+                }
+                objMap.put("small", false);
+                objMap.put("isBys", false);
+                objMap.put("isStock", false);
+                objMap.put("count", packageYCSLL.size());
+                objMap.put("isYcsll",true);
+                objMap.put("data", packageYCSLL);
             }else {
                 //不是存量  跳转到三大权益
                 objMap.put("isStock", false);
@@ -131,7 +145,6 @@ public class PackageUpgradeController extends BaseController {
             SendSmsAndMail.sendSms(selectOrder,s,"7");
             redisTemplate.opsForValue().set(selectOrder, s, 30, TimeUnit.MINUTES);
             return ResponseData.success(objMap, "已发送验证码到手机：" + nbr.substring(0, 3) + "****" + nbr.substring(7, 11));
-
         }
     }
 
@@ -154,7 +167,7 @@ public class PackageUpgradeController extends BaseController {
             try {
                 ver = redisTemplate.opsForValue().get(selectOrder).toString();
             } catch (NullPointerException n) {
-                return ResponseData.error("验证码已失效，请重新登入！");
+                return ResponseData.error("验证码已失效，请重新获取！");
             }
         } else {
             if (selectOrder.length() == 11) {
@@ -166,7 +179,7 @@ public class PackageUpgradeController extends BaseController {
             try {
                 ver = redisTemplate.opsForValue().get(selectOrder).toString();
             } catch (NullPointerException n) {
-                return ResponseData.error("验证码已失效，请重新登入！");
+                return ResponseData.error("验证码已失效，请重新获取！");
             }
         }
 
@@ -389,6 +402,70 @@ public class PackageUpgradeController extends BaseController {
         }
         return ResponseData.error("升级失败！");
     }
+    /**
+     * 查询套餐升级信息
+     *
+     * @param selectOrder      查询的手机号、身份证、宽带账号
+     * @param verificationCode 验证码
+     * @return
+     */
+    @RequestMapping(value = "checkoutAuthCodeYcsll", method = RequestMethod.POST)
+    public ResponseData<Map<String, Object>> checkoutAuthCodeYcsll(@RequestParam("id")String id,@RequestParam("selectOrder") String selectOrder, @RequestParam("verificationCode") String verificationCode) {
+        String ver = null;
+        try {
+            ver = redisTemplate.opsForValue().get(selectOrder).toString();
+        } catch (NullPointerException n) {
+            return ResponseData.error("验证码已失效，请重新获取！");
+        }
+        if(ver.equals(verificationCode)){
+            try{
+                insertYcsll(id,selectOrder);
+            }catch(Exception e){
+                e.printStackTrace();
+                return ResponseData.error("提交失败，请重试！");
+            }
+            return ResponseData.success();
+        }
+        return null;
+    }
+    /**
+     * 插入预存送流量完成数据
+     * */
+    public void insertYcsll(String partner, String acc_nbr){
+        Order order = new Order();
+        List<Map<String,Object>> list = appMapper.selectYCSLL(acc_nbr);
+        //合伙人字段
+        List<Map<String,Object>> partnerInfo  = userMapper.findPartnerById(partner);
 
-
+        String uuid = UUID.randomUUID().toString().replaceAll("-", "");
+        uuid = uuid.substring(1, 12);
+        SimpleDateFormat df = new SimpleDateFormat("yyyyMMdd");//设置日期格式
+        String orderNumber = "YRYM" + df.format(new Date()) + uuid;
+        order.setId(uuid);
+        order.setOrderNumber(orderNumber);
+        order.setOrderStatus("已完成");
+        order.setBusinessPackage("预存送流量");
+        order.setUserType("1");
+        order.setCreateTime(new Date());
+        order.setHehuorenId(partner);
+        if(list.size() > 0){
+            order.setNowPackage(list.get(0).get("now_package").toString());
+            order.setContactNumber(list.get(0).get("acc_nbr").toString());
+            if(!partnerInfo.isEmpty()) {
+                order.setHehuorenArea(partnerInfo.get(0).get("area").toString());
+                order.setHehuorenName(partnerInfo.get(0).get("name").toString());
+                order.setHehuorenSchool(partnerInfo.get(0).get("school").toString());
+                order.setHehuorenPhone(partnerInfo.get(0).get("account").toString());
+            }
+            List<Map<String, Object>> list2 = orderMapper.selectOrderYcsll(list.get(0).get("acc_nbr").toString());
+            if(list2.size() > 0){
+                // 更新hhr_order
+                Wrapper<Order> orderWrapper = new EntityWrapper<>();
+                orderWrapper.eq("id", list2.get(0).get("id"));
+                orderMapper.update(order,orderWrapper);
+            }else{
+                orderMapper.insert(order);
+            }
+        }
+    }
 }