Skip to content

G
gdtel-gztel-school-center
Commit c815d560 by 陈浩建
Options

存量升级=》排除因清单问题返回类型为int，但是当查询结果为空NULL，会报异常字段 

导入快递单号 修复存错参数
parent 60c78329
Showing with 72 additions and 64 deletions
common/src/main/java/com/winsun/outSideSystem/IntelligenceSendOrder.java
...@@ -1905,7 +1905,6 @@ public class IntelligenceSendOrder { ...@@ -1905,7 +1905,6 @@ public class IntelligenceSendOrder {
.build(); .build();
HttpEntity entity = null; HttpEntity entity = null;
HttpPost httpPost = new HttpPost(Constant.ZHANGSHIURL + "query.action"); HttpPost httpPost = new HttpPost(Constant.ZHANGSHIURL + "query.action");
RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig).build(); RequestConfig requestConfig = RequestConfig.copy(defaultRequestConfig).build();
httpPost.setConfig(requestConfig); httpPost.setConfig(requestConfig);
qParams.add(new BasicNameValuePair("service", "query.order.status"));//api标识，必填 qParams.add(new BasicNameValuePair("service", "query.order.status"));//api标识，必填
......
common/src/main/java/com/winsun/utils/RandomUtil.java
...@@ -40,7 +40,7 @@ public class RandomUtil { ...@@ -40,7 +40,7 @@ public class RandomUtil {
public static String RandomNumber(int length){ public static String RandomNumber(int length){
String str="1234567890abcdefghijklmnopqrstuvwxyz"; String str="1234567890abcdefghijklmnopqrstuvwxyz";
try { try {
SecureRandom random = SecureRandom.getInstance(str); Random random=new Random();
StringBuffer sb=new StringBuffer(); StringBuffer sb=new StringBuffer();
for(int i=0;i<length;i++){ for(int i=0;i<length;i++){
...@@ -64,11 +64,11 @@ public class RandomUtil { ...@@ -64,11 +64,11 @@ public class RandomUtil {
public static String ramdomNum(Integer length){ public static String ramdomNum(Integer length){
String str="1234567890"; String str="1234567890";
try{ try{
SecureRandom random = SecureRandom.getInstance(str); Random random=new Random();
StringBuffer sb=new StringBuffer(); StringBuffer sb=new StringBuffer();
for(int i=0;i<length;i++){ for(int i=0;i<length;i++){
int number =random.nextInt(10); int number = random.nextInt(10);
sb.append(str.charAt(number)); sb.append(str.charAt(number));
} }
......
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -154,69 +154,75 @@ public class PackageUpgradeController extends BaseController { ...@@ -154,69 +154,75 @@ public class PackageUpgradeController extends BaseController {
*/ */
@RequestMapping(value = "selectPackageNew") @RequestMapping(value = "selectPackageNew")
public ResponseData<Map<String,Object>> selectPackageNew(@RequestParam("acc_nbr")String acc_nbr, @RequestParam(value = "servId", required = false) String servId){ public ResponseData<Map<String,Object>> selectPackageNew(@RequestParam("acc_nbr")String acc_nbr, @RequestParam(value = "servId", required = false) String servId){
Map<String, Object> map = new HashMap<>(); try {
Map<String, Object> map = new HashMap<>();
//查找毕业生清单
Wrapper<QueryBys> queryBysWrapper = new EntityWrapper<>();
queryBysWrapper.eq(StringUtils.isNotBlank(acc_nbr), "phone", acc_nbr);
List<Map<String, Object>> queryBys = queryBysMapper.selectMaps(queryBysWrapper);
if(queryBys != null && queryBys.size()>0){
map.put("isBys", true);
return ResponseData.success(map);
}
//查找存量升级清单 //查找毕业生清单
Wrapper<PackageUpgrade> wrapper = new EntityWrapper(); Wrapper<QueryBys> queryBysWrapper = new EntityWrapper<>();
wrapper.setSqlSelect("serv_id", "cust_name", "user_type", "school_name", "acc_nbr", "acc_nbr2", "cdma_disc_desc", "is_bltc1" queryBysWrapper.eq(StringUtils.isNotBlank(acc_nbr), "phone", acc_nbr);
, "is_bltc2", "is_bltc3", "speed_kd", "wxcl"); List<Map<String, Object>> queryBys = queryBysMapper.selectMaps(queryBysWrapper);
if (StringUtils.isNotBlank(servId)) { if(queryBys != null && queryBys.size()>0){
wrapper.eq(StringUtils.isNotBlank(servId), "serv_id", servId); map.put("isBys", true);
} else { return ResponseData.success(map);
wrapper.eq(StringUtils.isNotBlank(acc_nbr), "acc_nbr", acc_nbr);
}
List<Map<String, Object>> packageUpgrade = appMapper.selectMaps(wrapper);
if (packageUpgrade.size() > 0) {
map.put("isBys", false);
map.put("isStock", true);
map.put("isYcsll",false);
Wrapper<Package> wrapper1 = new EntityWrapper();
Wrapper<Package> wrapper2 = new EntityWrapper();
if (packageUpgrade.get(0).get("cdma_disc_desc").equals("(预付费)天翼不限量99元套餐201802")) {
String is_bltc1 = packageUpgrade.get(0).get("is_bltc1").toString();
String is_bltc2 = packageUpgrade.get(0).get("is_bltc2").toString();
String is_bltc3 = packageUpgrade.get(0).get("is_bltc3").toString();
if (is_bltc1.equals("是") && is_bltc2.equals("否") && is_bltc3.equals("否")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-49元畅享");
} else if (is_bltc1.equals("否") && is_bltc2.equals("是") && is_bltc3.equals("是")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-29元畅享");
} else if (is_bltc1.equals("否") && is_bltc2.equals("是") && is_bltc3.equals("否")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-39元畅享");
}
}
wrapper1.eq("name", packageUpgrade.get(0).get("cdma_disc_desc"));
List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("package_name ", packageUpgrade.get(0).get("wxcl"));
List<Package> packages2 = packageMapper.selectList(wrapper2);
if (packages2.size() == 0) {
return ResponseData.error("当前查询条件未查出套餐升级数据，如有疑问请联系客服！");
}
map = packageUpgrade.get(0);
map.put("acc_nbr", map.get("acc_nbr").toString().substring(0, 3) + "****" + map.get("acc_nbr").toString().substring(7, 11));
if (map.containsKey("acc_nbr2")) {
String[] split = map.get("acc_nbr2").toString().split("@");
map.put("acc_nbr", map.get("acc_nbr2").toString().substring(0, 4) + "*****@" + split[1]);
} }
if (packages1.size() == 0) { log.info("存量升级查询号码："+acc_nbr);
map.put("oldPackage", null); //查找存量升级清单
Wrapper<PackageUpgrade> wrapper = new EntityWrapper();
wrapper.setSqlSelect("serv_id", "acc_nbr", "cdma_disc_desc", "is_bltc1", "is_bltc2", "is_bltc3", "wxcl");
if (StringUtils.isNotBlank(servId)) {
wrapper.eq(StringUtils.isNotBlank(servId), "serv_id", servId);
} else { } else {
map.put("oldPackage", packages1.get(0)); wrapper.eq(StringUtils.isNotBlank(acc_nbr), "acc_nbr", acc_nbr);
} }
map.put("newPackage", packages2.get(0)); wrapper.isNotNull("wxcl");
String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000)); List<Map<String, Object>> packageUpgrade = appMapper.selectMaps(wrapper);
log.info("验证码:" + s); if (packageUpgrade.size() > 0) {
SendSmsAndMail.sendSms(acc_nbr,s,"7"); log.info("存量升级查询结果："+packageUpgrade.get(0).toString());
redisTemplate.opsForValue().set(acc_nbr, s, 30, TimeUnit.MINUTES); map.put("isBys", false);
return ResponseData.success(map, "已发送验证码到手机：" + acc_nbr.substring(0, 3) + "****" + acc_nbr.substring(7, 11)); map.put("isStock", true);
map.put("isYcsll",false);
Wrapper<Package> wrapper1 = new EntityWrapper();
Wrapper<Package> wrapper2 = new EntityWrapper();
if (packageUpgrade.get(0).get("cdma_disc_desc").equals("(预付费)天翼不限量99元套餐201802")) {
String is_bltc1 = packageUpgrade.get(0).get("is_bltc1").toString();
String is_bltc2 = packageUpgrade.get(0).get("is_bltc2").toString();
String is_bltc3 = packageUpgrade.get(0).get("is_bltc3").toString();
if (is_bltc1.equals("是") && is_bltc2.equals("否") && is_bltc3.equals("否")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-49元畅享");
} else if (is_bltc1.equals("否") && is_bltc2.equals("是") && is_bltc3.equals("是")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-29元畅享");
} else if (is_bltc1.equals("否") && is_bltc2.equals("是") && is_bltc3.equals("否")) {
packageUpgrade.get(0).put("cdma_disc_desc", "(预付费)天翼不限量99元套餐201802-39元畅享");
}
}
wrapper1.eq("package_name", packageUpgrade.get(0).get("cdma_disc_desc"));
List<Package> packages1 = packageMapper.selectList(wrapper1);
wrapper2.eq("package_name", packageUpgrade.get(0).get("wxcl"));
List<Package> packages2 = packageMapper.selectList(wrapper2);
if (packages2.size() == 0) {
return ResponseData.error("当前查询条件未查出套餐升级数据，如有疑问请联系客服！");
}
log.info("新套餐："+acc_nbr+":"+packages2.get(0).toString());
map = packageUpgrade.get(0);
map.put("acc_nbr", map.get("acc_nbr").toString().substring(0, 3) + "****" + map.get("acc_nbr").toString().substring(7, 11));
if (packages1.size() == 0) {
map.put("oldPackage", null);
} else {
map.put("oldPackage", packages1.get(0));
log.info("旧套餐："+acc_nbr+":"+packages1.get(0).toString());
}
map.put("newPackage", packages2.get(0));
String s = String.valueOf((int) ((RandomUtil.getSecrityRandom() * 9 + 1) * 100000));
log.info("验证码:" + s);
SendSmsAndMail.sendSms(acc_nbr,s,"7");
redisTemplate.opsForValue().set(acc_nbr, s, 30, TimeUnit.MINUTES);
return ResponseData.success(map, "已发送验证码到手机：" + acc_nbr.substring(0, 3) + "****" + acc_nbr.substring(7, 11));
}
}catch (Exception e){
e.printStackTrace();
} }
return ResponseData.error("当前号码未查出套餐升级数据，如有疑问请联系客服！"); return ResponseData.error("当前号码未查出套餐升级数据，如有疑问请联系客服！");
} }
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -1472,7 +1472,7 @@ public class OrderController extends BaseController { ...@@ -1472,7 +1472,7 @@ public class OrderController extends BaseController {
} }
Order dataOrder = new Order(); Order dataOrder = new Order();
dataOrder.setId(orderByNumber.get(0).getId()); dataOrder.setId(orderByNumber.get(0).getId());
dataOrder.setBusinessNumber(String.valueOf(number)); dataOrder.setBusinessNumber(String.valueOf(businessNumber));
dataOrder.setBusinessIccid(String.valueOf(iccid)); dataOrder.setBusinessIccid(String.valueOf(iccid));
dataOrder.setSendType("快递"); dataOrder.setSendType("快递");
dataOrder.setOrderStatus("提交中"); dataOrder.setOrderStatus("提交中");
......
service-manager/src/main/java/com/winsun/controller/PackageController.java
...@@ -180,6 +180,9 @@ public class PackageController extends BaseController { ...@@ -180,6 +180,9 @@ public class PackageController extends BaseController {
wrapper.like(StringUtils.isNotBlank(monthFee), "month_fee", monthFee, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(monthFee), "month_fee", monthFee, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(flow), "flow", flow, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(flow), "flow", flow, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(voice), "voice", voice, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(voice), "voice", voice, SqlLike.DEFAULT);
List<String> objects = new ArrayList<>();
objects.add("id");
wrapper.orderDesc(objects);
Page<Package> page = new Page<>(pageIndex, pageSize); Page<Package> page = new Page<>(pageIndex, pageSize);
List<Package> aPackage = packageMapper.selectPage(page, wrapper); List<Package> aPackage = packageMapper.selectPage(page, wrapper);
page.setRecords(aPackage); page.setRecords(aPackage);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment