Skip to content

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

小白卡调整+导入配置

parent cfb72c07
Showing with 52 additions and 37 deletions
core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java
...@@ -137,7 +137,6 @@ public class LoginPwdController extends BaseController { ...@@ -137,7 +137,6 @@ public class LoginPwdController extends BaseController {
if (StringUtils.isBlank(sysUser.getAccount())) { if (StringUtils.isBlank(sysUser.getAccount())) {
return ResponseData.error(hashMap, "当前账号异常！"); return ResponseData.error(hashMap, "当前账号异常！");
} }
log.info("sysUser.getAccount()"+sysUser.getAccount());
// 信息正确，调用登录 // 信息正确，调用登录
return this.loginvalid(hashMap, sysUser.getAccount(), openId); return this.loginvalid(hashMap, sysUser.getAccount(), openId);
} }
......
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -219,7 +219,7 @@ public class PackageNewClothes { ...@@ -219,7 +219,7 @@ public class PackageNewClothes {
wrapper.eq("user_type", UserType.NEWCUSTOMER.getId()); wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
List<Order> orders = orderMapper.selectList(wrapper); List<Order> orders = orderMapper.selectList(wrapper);
if (orders.size() != 0) { if (orders.size() != 0) {
return ResponseData.error("您已经存在办理中的新开卡的订单，不能再重复开卡！"); return ResponseData.error("您已经存在办理中的新开卡的订单，请联系客服咨询");
} }
wrapper = new EntityWrapper(); wrapper = new EntityWrapper();
wrapper.eq("id_card",idCard); wrapper.eq("id_card",idCard);
...@@ -228,7 +228,7 @@ public class PackageNewClothes { ...@@ -228,7 +228,7 @@ public class PackageNewClothes {
wrapper.eq("user_type", UserType.NEWCUSTOMER.getId()); wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
orders = orderMapper.selectList(wrapper); orders = orderMapper.selectList(wrapper);
if (orders.size() != 0) { if (orders.size() != 0) {
return ResponseData.error("您94天内已经存在新开卡的订单，不能再重复开卡！"); return ResponseData.error("您94天内已经存在新开卡的订单，请联系客服咨询");
} }
SysUser sysUser = userMapper.selectById(partner); SysUser sysUser = userMapper.selectById(partner);
...@@ -374,7 +374,7 @@ public class PackageNewClothes { ...@@ -374,7 +374,7 @@ public class PackageNewClothes {
wrapper.eq("user_type", UserType.NEWCUSTOMER.getId()); wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
List<Order> orders = orderMapper.selectList(wrapper); List<Order> orders = orderMapper.selectList(wrapper);
if (orders.size() != 0) { if (orders.size() != 0) {
return ResponseData.error("您已经存在办理中的新开卡的订单，不能再重复开卡！"); return ResponseData.error("您已经存在办理中的新开卡的订单，请联系客服咨询！");
} }
wrapper = new EntityWrapper(); wrapper = new EntityWrapper();
wrapper.eq("id_card",idCard); wrapper.eq("id_card",idCard);
...@@ -383,7 +383,7 @@ public class PackageNewClothes { ...@@ -383,7 +383,7 @@ public class PackageNewClothes {
wrapper.eq("user_type", UserType.NEWCUSTOMER.getId()); wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
orders = orderMapper.selectList(wrapper); orders = orderMapper.selectList(wrapper);
if (orders.size() != 0) { if (orders.size() != 0) {
return ResponseData.error("您94天内已经存在新开卡的订单，不能再重复开卡！"); return ResponseData.error("您94天内已经存在新开卡的订单，请联系客服咨询！");
} }
SysUser sysUser = userMapper.selectById(partner); SysUser sysUser = userMapper.selectById(partner);
...@@ -463,28 +463,28 @@ public class PackageNewClothes { ...@@ -463,28 +463,28 @@ public class PackageNewClothes {
/** /**
* 新开手机卡 小白卡 * 新开手机卡 小白卡
* *
* @param contactNumber 联系电话
* @param site 地址 * @param site 地址
* @param kapin 套餐名
* @param studentCard 学生卡 * @param studentCard 学生卡
* @param remarks 备注
* @param customerName 用户姓名
* @param contactNumber 联系电话
* @param cardId 套餐ID * @param cardId 套餐ID
* @param address 详细地址
* @param customerName 用户姓名
* @param partner 用户ID * @param partner 用户ID
* @param businessNumber 办理号码
* @param remarks 备注
* @param kapin 套餐名
* @param idCard 用户身份证 * @param idCard 用户身份证
* @param userSchool 学校 * @param userSchool 学校
* @param address 详细地址
* @param businessNumber 办理号码
* @return * @return
*/ */
@RequestMapping(value = "XiaoBaiCard", method = RequestMethod.POST) @RequestMapping(value = "XiaoBaiCard", method = RequestMethod.POST)
public ResponseData<String> XiaoBaiCard(@RequestParam("contactNumber") String contactNumber, @RequestParam("site") String site public ResponseData<String> XiaoBaiCard(@RequestParam("contactNumber") String contactNumber, @RequestParam("site") String site
, @RequestParam("studentCard") String studentCard, @RequestParam("cardId") String cardId, @RequestParam("address") String address , @RequestParam("studentCard") String studentCard, @RequestParam("cardId") String cardId, @RequestParam("address") String address
, @RequestParam("customerName") String customerName, @RequestParam("partner") String partner, @RequestParam("businessNumber") String businessNumber , @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("signUrl") String signUrl , @RequestParam(value = "remarks", required = false) String remarks, @RequestParam(value = "kapin") String kapin, @RequestParam("signUrl") String signUrl
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool , @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool
, @RequestParam(value = "isFromRh", required = false) String isFromRh , @RequestParam(value = "isFromRh", required = false) String isFromRh
,@RequestParam(value = "sell",required = false)String sell) { , @RequestParam(value = "sell",required = false)String sell) {
if(sell != null && StringUtils.isNumeric(sell)){ if(sell != null && StringUtils.isNumeric(sell)){
}else { }else {
...@@ -499,24 +499,27 @@ public class PackageNewClothes { ...@@ -499,24 +499,27 @@ public class PackageNewClothes {
/** /**
* TODO 待识别订单返回进入旧订单入口 * TODO 待识别订单返回进入旧订单入口
*/ */
// Wrapper<Order> wrapper = new EntityWrapper(); Map<String, Object> mapData = new HashMap<>();
// wrapper.eq("id_card",idCard); Wrapper<Order> wrapper = new EntityWrapper();
// wrapper.eq("order_status", "待识别"); wrapper.eq("id_card",idCard);
// wrapper.eq("user_type", UserType.NEWCUSTOMER.getId()); wrapper.eq("order_status", "待识别");
// List<Order> orders = orderMapper.selectList(wrapper); wrapper.isNotNull("xb_order_id");
// if (orders.size() != 0) { wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
// return ResponseData.error("您已经存在办理中的新开卡的订单，不能再重复开卡！"); List<Order> orders = orderMapper.selectList(wrapper);
// } if (orders.size() != 0) {
mapData.put("orderStatus",orders.get(0).getOrderStatus());
return ResponseData.error("待识别");
}
/** /**
* 办理中+94天内订单判断 * 办理中+94天内订单判断
*/ */
Wrapper<Order> wrapper = new EntityWrapper(); wrapper = new EntityWrapper();
wrapper.eq("id_card",idCard); wrapper.eq("id_card",idCard);
wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName()).and().ne("order_status", OrderStatus.SUCCESSFULDISTRIBUTION.getName()); wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName()).and().ne("order_status", OrderStatus.SUCCESSFULDISTRIBUTION.getName());
wrapper.eq("user_type", UserType.NEWCUSTOMER.getId()); wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
List<Order> orders = orderMapper.selectList(wrapper); orders = orderMapper.selectList(wrapper);
if (orders.size() != 0) { if (orders.size() != 0) {
return ResponseData.error("您已经存在办理中的新开卡的订单，不能再重复开卡！"); return ResponseData.error("您已经存在办理中的新开卡的订单，请联系客服咨询！");
} }
Calendar instance = Calendar.getInstance(); Calendar instance = Calendar.getInstance();
instance.add(Calendar.DATE, -94); instance.add(Calendar.DATE, -94);
...@@ -528,7 +531,7 @@ public class PackageNewClothes { ...@@ -528,7 +531,7 @@ public class PackageNewClothes {
wrapper.eq("user_type", UserType.NEWCUSTOMER.getId()); wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
orders = orderMapper.selectList(wrapper); orders = orderMapper.selectList(wrapper);
if (orders.size() != 0) { if (orders.size() != 0) {
return ResponseData.error("您94天内已经存在新开卡的订单，不能再重复开卡！"); return ResponseData.error("您94天内已经存在新开卡的订单，请联系客服咨询！");
} }
if (contactNumber.length() != 11) { if (contactNumber.length() != 11) {
...@@ -589,7 +592,7 @@ public class PackageNewClothes { ...@@ -589,7 +592,7 @@ public class PackageNewClothes {
return ResponseData.error("小白卡下单失败,如有疑问请联系客服,谢谢。"); return ResponseData.error("小白卡下单失败,如有疑问请联系客服,谢谢。");
} }
if (!"0".equals(jsonObject.getString("code"))) { if (!"0".equals(jsonObject.getString("code"))) {
return ResponseData.error(jsonObject.getString("msg")); return ResponseData.error("省合伙人:"+jsonObject.getString("msg"));
} }
Map<String, Object> map = JSON.parseObject(jsonObject.getString("dataArray"), HashMap.class); Map<String, Object> map = JSON.parseObject(jsonObject.getString("dataArray"), HashMap.class);
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -93,7 +93,7 @@ public class OrderController extends BaseController { ...@@ -93,7 +93,7 @@ public class OrderController extends BaseController {
*/ */
private static String KD_ORDERNUMBER = "订单编号(必填)"; private static String KD_ORDERNUMBER = "订单编号(必填)";
private static String KD_SENDTYPE = "快递方式(必填)"; private static String KD_SENDTYPE = "快递方式(必填)";
private static String KD_COMPANY = "快递公司(快递方式为快递必须填写)"; private static String KD_COMPANY = "快递公司(必填)";
private static String KD_KUAIDORDER = "快递单号(必填)"; private static String KD_KUAIDORDER = "快递单号(必填)";
private static String KD_CONTACTNAME = "客户姓名"; private static String KD_CONTACTNAME = "客户姓名";
private static String KD_CONTACTNUMBER = "联系号码"; private static String KD_CONTACTNUMBER = "联系号码";
...@@ -1365,10 +1365,13 @@ public class OrderController extends BaseController { ...@@ -1365,10 +1365,13 @@ public class OrderController extends BaseController {
if (!listMap.get(0).get("d").toString().equals(KD_HEHUORENSCHOOL)) { if (!listMap.get(0).get("d").toString().equals(KD_HEHUORENSCHOOL)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("e").toString().equals(KD_KUAIDORDER)) { if (!listMap.get(0).get("e").toString().equals(KD_COMPANY)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("f").toString().equals(KD_BUSINESSICCID)) { if (!listMap.get(0).get("f").toString().equals(KD_KUAIDORDER)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("g").toString().equals(KD_BUSINESSICCID)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
/* /*
...@@ -1376,6 +1379,7 @@ public class OrderController extends BaseController { ...@@ -1376,6 +1379,7 @@ public class OrderController extends BaseController {
客户姓名 customer_name KD_CONTACTNAME 客户姓名 customer_name KD_CONTACTNAME
联系号码 contact_number KD_CONTACTNUMBER 联系号码 contact_number KD_CONTACTNUMBER
合伙人学校 hehuoren_school KD_HEHUORENSCHOOL 合伙人学校 hehuoren_school KD_HEHUORENSCHOOL
快递公司 company KD_COMPANY
快递单号 kuaidi_order KD_KUAIDORDER 快递单号 kuaidi_order KD_KUAIDORDER
白卡ICCID business_iccid KD_BUSINESSICCID 白卡ICCID business_iccid KD_BUSINESSICCID
*/ */
...@@ -1391,15 +1395,21 @@ public class OrderController extends BaseController { ...@@ -1391,15 +1395,21 @@ public class OrderController extends BaseController {
return ResponseData.error("第" + (i + 1) + "行的订单编号不能为空"); return ResponseData.error("第" + (i + 1) + "行的订单编号不能为空");
} }
if (!temp.containsKey("e")) { if (!temp.containsKey("e")) {
return ResponseData.error("第" + (i + 1) + "行的快递单号不能为空"); return ResponseData.error("第" + (i + 1) + "行的快递公司不能为空");
} }
if (StringUtils.isBlank(temp.get("e").toString())) { if (StringUtils.isBlank(temp.get("e").toString())) {
return ResponseData.error("第" + (i + 1) + "行的快递单号不能为空"); return ResponseData.error("第" + (i + 1) + "行的快递公司不能为空");
} }
if (!temp.containsKey("f")) { if (!temp.containsKey("f")) {
return ResponseData.error("第" + (i + 1) + "行的白卡ICCID不能为空"); return ResponseData.error("第" + (i + 1) + "行的快递单号不能为空");
} }
if (StringUtils.isBlank(temp.get("f").toString())) { if (StringUtils.isBlank(temp.get("f").toString())) {
return ResponseData.error("第" + (i + 1) + "行的快递单号不能为空");
}
if (!temp.containsKey("g")) {
return ResponseData.error("第" + (i + 1) + "行的白卡ICCID不能为空");
}
if (StringUtils.isBlank(temp.get("g").toString())) {
return ResponseData.error("第" + (i + 1) + "行的白卡ICCID不能为空"); return ResponseData.error("第" + (i + 1) + "行的白卡ICCID不能为空");
} }
} }
...@@ -1428,9 +1438,9 @@ public class OrderController extends BaseController { ...@@ -1428,9 +1438,9 @@ public class OrderController extends BaseController {
Map<String, Object> map = listMap.get(i); Map<String, Object> map = listMap.get(i);
String orderNumber = map.get("a").toString(); String orderNumber = map.get("a").toString();
String sendType = "快递"; String sendType = "快递";
String company = "邮政EMS"; String company = map.get("e").toString();
String kuaidiOrder = map.get("e").toString(); String kuaidiOrder = map.get("f").toString();
String businessIccid = map.get("f").toString(); String businessIccid = map.get("g").toString();
String orderStatus = null; String orderStatus = null;
Order order = null; Order order = null;
Wrapper<Order> wrapper = new EntityWrapper<>(); Wrapper<Order> wrapper = new EntityWrapper<>();
...@@ -1863,8 +1873,8 @@ public class OrderController extends BaseController { ...@@ -1863,8 +1873,8 @@ public class OrderController extends BaseController {
//创建工作表 //创建工作表
XSSFSheet sheet = workbook.createSheet("一人一码受理单"); XSSFSheet sheet = workbook.createSheet("一人一码受理单");
sheet.setColumnWidth(0, 5000); sheet.setColumnWidth(0, 5000);
sheet.setColumnWidth(2, 4000);
sheet.setColumnWidth(1, 4000); sheet.setColumnWidth(1, 4000);
sheet.setColumnWidth(2, 4000);
sheet.setColumnWidth(3, 9000); sheet.setColumnWidth(3, 9000);
//下拉选项 //下拉选项
List<String> fengju = new ArrayList<>(); List<String> fengju = new ArrayList<>();
...@@ -1904,6 +1914,7 @@ public class OrderController extends BaseController { ...@@ -1904,6 +1914,7 @@ public class OrderController extends BaseController {
客户姓名 customer_name KD_CONTACTNAME 客户姓名 customer_name KD_CONTACTNAME
联系号码 contact_number KD_CONTACTNUMBER 联系号码 contact_number KD_CONTACTNUMBER
合伙人学校 hehuoren_school KD_HEHUORENSCHOOL 合伙人学校 hehuoren_school KD_HEHUORENSCHOOL
快递公司 company KD_COMPANY
快递单号 kuaidi_order KD_KUAIDORDER 快递单号 kuaidi_order KD_KUAIDORDER
白卡ICCID business_iccid KD_BUSINESSICCID 白卡ICCID business_iccid KD_BUSINESSICCID
*/ */
...@@ -1911,6 +1922,7 @@ public class OrderController extends BaseController { ...@@ -1911,6 +1922,7 @@ public class OrderController extends BaseController {
columns.add(KD_CONTACTNAME); columns.add(KD_CONTACTNAME);
columns.add(KD_CONTACTNUMBER); columns.add(KD_CONTACTNUMBER);
columns.add(KD_HEHUORENSCHOOL); columns.add(KD_HEHUORENSCHOOL);
columns.add(KD_COMPANY);
columns.add(KD_KUAIDORDER); columns.add(KD_KUAIDORDER);
columns.add(KD_BUSINESSICCID); columns.add(KD_BUSINESSICCID);
ServletOutputStream os = null; ServletOutputStream os = null;
...@@ -1924,6 +1936,7 @@ public class OrderController extends BaseController { ...@@ -1924,6 +1936,7 @@ public class OrderController extends BaseController {
sheet.setColumnWidth(3, 10000); sheet.setColumnWidth(3, 10000);
sheet.setColumnWidth(4, 9000); sheet.setColumnWidth(4, 9000);
sheet.setColumnWidth(5, 9000); sheet.setColumnWidth(5, 9000);
sheet.setColumnWidth(6, 9000);
//下拉选项 //下拉选项
List<String> fengju = new ArrayList<>(); List<String> fengju = new ArrayList<>();
fengju.add("快递"); fengju.add("快递");
...@@ -2428,7 +2441,7 @@ public class OrderController extends BaseController { ...@@ -2428,7 +2441,7 @@ public class OrderController extends BaseController {
@RequestParam("company")String company, @RequestParam("company")String company,
@RequestParam("kuaidiOrder")String kuaidiOrder){ @RequestParam("kuaidiOrder")String kuaidiOrder){
ShiroUser user = getShiroUser(); ShiroUser user = getShiroUser();
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员", "县分管理员（订单）","受理人员","楼长"))) { if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "超级管理员","系统管理员", "县分管理员（订单）","受理人员","楼长","快递公司"))) {
}else{ }else{
return ResponseData.error("无数据权限"); return ResponseData.error("无数据权限");
......
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