Skip to content

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

快递员可配置化

parent 56e2f06a
Showing with 89 additions and 28 deletions
apply-net/src/main/java/com/winsun/controller/DankuanController.java
......@@ -125,6 +125,11 @@ public class DankuanController {
String setMealIndex = request.getParameter("setMealIndex");
String imgUrl = request.getParameter("imgUrl");
String sell = request.getParameter("sell");
if(sell != null && StringUtils.isNumeric(sell)){
}else {
sell = "";
}
String filePath = "";
String orderSeq = RandomUtil.RandomNumber(20);
try{
......
apply-net/src/main/java/com/winsun/controller/RongHeController.java
......@@ -162,6 +162,11 @@ public class RongHeController {
String rhTime = request.getParameter("rhTime");
String setMealIndex = request.getParameter("setMealIndex");
String sell = request.getParameter("sell");
if(sell != null && StringUtils.isNumeric(sell)){
}else {
sell = "";
}
String imgUrl = request.getParameter("imgUrl");
String filePath = "";
String orderSeq = RandomUtil.RandomNumber(20);
......
common/src/main/java/com/winsun/service/impl/HhrUserServiceImpl.java
......@@ -44,8 +44,7 @@ public class HhrUserServiceImpl extends ServiceImpl<HhrUserMapper, HhrUser> impl
HhrUser hhrUser = this.selectById(userId);
String rolesStr = sb.toString();
if (rolesStr.indexOf("超级管理员") != -1 || rolesStr.indexOf("快递公司") != -1) {
// 快递公司另做权限
if (rolesStr.indexOf("超级管理员") != -1) {
return resultList;
}else if(rolesStr.indexOf("县分管理员（订单）") != -1 || "总经理".equals(hhrUser.getPosition())){
// 县分管理员、督导(查询管辖内的学校用户)
......@@ -53,6 +52,9 @@ public class HhrUserServiceImpl extends ServiceImpl<HhrUserMapper, HhrUser> impl
}else if(rolesStr.indexOf("合伙人") != -1 && "楼长".equals(hhrUser.getPosition())) {
// 合伙人（楼长，查询本人及下级信息）
resultList = this.getChildrenUser(userId);
}else if(rolesStr.indexOf("快递公司") != -1){
// 快递公司(查询管辖内的学校用户)
resultList = this.getSubNameUser(userId);
}else{
// 合伙人（成员，查询本人信息）其他人员
}
......
core-service/src/main/java/com/winsun/item/modular/system/controller/LoginPwdController.java
......@@ -238,7 +238,7 @@ public class LoginPwdController extends BaseController {
return ResponseData.error("验证码错误！");
}
Wrapper<SysUser> wrapperU = new EntityWrapper<>();
wrapperU.eq("account", username);
wrapperU.eq("account", username).eq("status", "1");;
List<SysUser> users = sysUserMapper.selectList(wrapperU);
if (users.size() == 0) {
return ResponseData.error("当前账号不存在！");
......
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
......@@ -171,6 +171,11 @@ public class PackageNewClothes {
,@RequestParam(value = "clazz") String clazz, @RequestParam(value = "userSchool") String userSchool
,@RequestParam(value = "isFromRh", required = false) String isFromRh
,@RequestParam(value = "sell",required = false)String sell) {
if(sell != null && StringUtils.isNumeric(sell)){
}else {
sell = "";
}
if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入");
}
......@@ -331,7 +336,11 @@ public class PackageNewClothes {
, @RequestParam(value = "userSchool") String userSchool
, @RequestParam(value = "isFromRh", required = false) String isFromRh
, @RequestParam(value = "sell",required = false) String sell) {
if(sell != null && StringUtils.isNumeric(sell)){
}else {
sell = "";
}
if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入");
}
......@@ -476,18 +485,31 @@ public class PackageNewClothes {
, @RequestParam(value = "idCard") String idCard, @RequestParam(value = "userSchool") String userSchool
, @RequestParam(value = "isFromRh", required = false) String isFromRh
,@RequestParam(value = "sell",required = false)String sell) {
if(sell != null && StringUtils.isNumeric(sell)){
}else {
sell = "";
}
/**
* 身份证验证最后一位 x =》 X
*/
idCard = IDCardUtil.IdCardConversion(idCard);
/**
* TODO 待识别订单返回进入旧订单入口
*/
// Wrapper<Order> wrapper = new EntityWrapper();
// wrapper.eq("id_card",idCard);
// wrapper.eq("order_status", "待识别");
// wrapper.eq("user_type", UserType.NEWCUSTOMER.getId());
// List<Order> orders = orderMapper.selectList(wrapper);
// if (orders.size() != 0) {
// return ResponseData.error("您已经存在办理中的新开卡的订单，不能再重复开卡！");
// }
/**
* 办理中+94天内订单判断
*/
Calendar instance = Calendar.getInstance();
instance.add(Calendar.DATE, -94);
Date time = instance.getTime();
Wrapper<Order> wrapper = new EntityWrapper();
wrapper.eq("id_card",idCard);
wrapper.ne("order_status", OrderStatus.ACCEPTEXCEPTCION.getName()).and().ne("order_status", OrderStatus.SUCCESSFULDISTRIBUTION.getName());
......@@ -496,6 +518,9 @@ public class PackageNewClothes {
if (orders.size() != 0) {
return ResponseData.error("您已经存在办理中的新开卡的订单，不能再重复开卡！");
}
Calendar instance = Calendar.getInstance();
instance.add(Calendar.DATE, -94);
Date time = instance.getTime();
wrapper = new EntityWrapper();
wrapper.eq("id_card",idCard);
wrapper.gt("create_time", time);
......
old-user/src/main/java/com/winsun/controller/ChooseController.java
......@@ -145,7 +145,6 @@ public class ChooseController {
/**
* 查询学校信息
*/
@RequestMapping(value = "selectSchoolInfo", method = RequestMethod.POST)
public ResponseData<School> selectSchoolInfo(@RequestParam("partner") String partner) {
String schoolId = appMapper.selectSchoolId(partner);
......
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
......@@ -257,6 +257,11 @@ public class PackageUpgradeController extends BaseController {
@RequestParam("newPackage_id") String newPackage_id,
@RequestParam("signUrl") String signUrl,
@RequestParam(value = "sell",required = false) String sell) {
if(sell != null && StringUtils.isNumeric(sell)){
}else {
sell = "";
}
if (contactNumber.length() != 11) {
return ResponseData.error("联系号码有误，请重新输入");
}
......@@ -701,7 +706,11 @@ public class PackageUpgradeController extends BaseController {
@RequestParam("oldPackage")String oldPackage, // 老卡品
@RequestParam("signUrl")String signUrl, // 签名
@RequestParam(value = "sell",required = false)String sell){
if(sell != null && StringUtils.isNumeric(sell)){
}else {
sell = "";
}
// 短信校验
Object o = redisTemplate.opsForValue().get(businessNumber);
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
......@@ -252,7 +252,6 @@ public class OrderController extends BaseController {
Integer integer = orderMapper.updateById(saveOrder);
if (integer == 1) {
appMapper.inserOrderHis(id, "实名验证中", new Date(), user.getName());
// 另起线程执行智能平台下单
new Thread(new Runnable() {
@Override
......@@ -276,13 +275,14 @@ public class OrderController extends BaseController {
map1.put("idCardUrl1", order.getIdCardz());
map1.put("idCardUrl2", order.getIdCardf());
map1.put("idCardUrl3", order.getIdCardzs());
map1.put("idCardUrl4", order.getStudenCard());
map1.put("cardType", order.getKapin());
if (order.getPackageId().equals("49")) {
map1.put("userName", order.getParentName());
map1.put("idCardUrl4", order.getIdCardzs());
} else {
map1.put("userName", order.getCustomerName());
map1.put("idCardUrl4", order.getStudenCard());
}
map1.put("linkPhone", order.getContactNumber());
map1.put("idCard", order.getIdCard());
......@@ -450,7 +450,7 @@ public class OrderController extends BaseController {
* @return
*/
@Permission(menuname = "查询订单信息", value = "list", method = RequestMethod.POST)
public Map<String,Object> listOrder(//kuaidi_timeStart
public Map<String,Object> listOrder(
@RequestParam(name = "createTimeStart", required = false) String createTimeStart,
@RequestParam(name = "createTimeEnd", required = false) String createTimeEnd,
@RequestParam(name = "successTimeStart", required = false) String successTimeStart,
......@@ -501,18 +501,15 @@ public class OrderController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
wrapper.eq(StringUtils.isNotBlank(orderId),"order_id", orderId);
wrapper.eq(StringUtils.isNotBlank(xbOrderId), "xb_order_id", xbOrderId);
//wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin);
wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin);
wrapper.eq(StringUtils.isNotBlank(customerName), "customer_name", customerName);
wrapper.eq(StringUtils.isNotBlank(businessNumber), "business_number", businessNumber);
wrapper.eq(StringUtils.isNotBlank(contactNumber), "contact_number", contactNumber);
wrapper.like(StringUtils.isNotBlank(hehuorenSchool), "hehuoren_school", hehuorenSchool);
wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(businessPackage), "business_package", businessPackage, SqlLike.DEFAULT);
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
wrapper.eq("hehuoren_area", "本部");
}else{
wrapper.eq(StringUtils.isNotBlank(hehuorenArea), "hehuoren_area", hehuorenArea);
}
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
wrapper.in("order_status", "待配送,待活体,已完成");
......@@ -773,13 +770,12 @@ public class OrderController extends BaseController {
}
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
// 快递员仅能导出 新用户办理、待配送、分公司配送订单
map.put("userType",0);
map.put("orderStatus", "待配送");
map.put("hehuorenArea", "本部");
map.put("isDelivery", 2);
}else{
map.put("hehuorenArea", hehuorenArea);
}
map.put("hehuorenArea", hehuorenArea);
try {
ExportOrderView(map);
taskImport.taskImport(map);
......@@ -863,13 +859,21 @@ public class OrderController extends BaseController {
isDelivery = map.get("isDelivery").toString();
}
ShiroUser user = getShiroUser();
// 添加查询权限
List<Integer> userIds = hhrUserService.getUserIds(user.getId(), user.getRoleNames());
EntityWrapper<Order> wrapper = new EntityWrapper();
wrapper.setSqlSelect("customer_name, business_number, order_status, create_time, " +
"hehuoren_id,hehuoren_area, hehuoren_school, hehuoren_name, hehuoren_phone, " +
"supervisor_name, user_type, now_package, business_package, contact_number, order_number, xb_order_id, site, address, " +
"supervisor_name, user_type, kapin, business_package, contact_number, order_number, xb_order_id, site, address, " +
"is_delivery, company, kuaidi_order, business_iccid, kuaidi_time, success_time, userSchool, student_card_check_status, " +
"parent_name, student_number, class_number");
wrapper.notIn( "user_type", "3,5,9,10");
if (userIds.size() != 0) {
wrapper.in("hehuoren_id", userIds);
}
wrapper.ge(StringUtils.isNotBlank(createTimeStart), "create_time", createTimeStart);
wrapper.le(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd);
wrapper.ge(StringUtils.isNotBlank(successTimeStart), "success_time", successTimeStart);
......@@ -878,7 +882,7 @@ public class OrderController extends BaseController {
wrapper.le(StringUtils.isNotBlank(kuaidiTimeEnd), "kuaidi_time", kuaidiTimeEnd);
wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType);
wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber);
//wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin);
// wrapper.eq(StringUtils.isNotBlank(kapin), "kapin", kapin);
// wrapper.isNotNull(isYzk, "order_id");
wrapper.eq(StringUtils.isNotBlank(hehuorenArea), "hehuoren_area", hehuorenArea);
wrapper.eq(StringUtils.isNotBlank(customerName), "customer_name", customerName);
......@@ -889,6 +893,7 @@ public class OrderController extends BaseController {
wrapper.like(StringUtils.isNotBlank(businessPackage), "business_package", businessPackage, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus);
wrapper.eq(StringUtils.isNotBlank(isDelivery), "is_delivery", isDelivery);
wrapper.orderBy("create_time",false);
List<Map<String, Object>> Orders = orderMapper.selectMaps(wrapper);
List<String> tops = new ArrayList<>();
tops.add("客户姓名");
......@@ -930,7 +935,7 @@ public class OrderController extends BaseController {
columns.add("hehuoren_phone");
columns.add("supervisor_name");
columns.add("user_type");
columns.add("now_package");
columns.add("kapin");
columns.add("business_package");
columns.add("contact_number");
columns.add("order_number");
......@@ -1412,6 +1417,9 @@ public class OrderController extends BaseController {
log.error("快递单导入异常", e.getMessage());
return ResponseData.error("导入异常！");
}
// 添加查询权限
List<Integer> userIds = hhrUserService.getUserIds(user.getId(), user.getRoleNames());
int number = 0;
Date successTime = null;
Date kuaidiTime = null;
......@@ -1427,9 +1435,11 @@ public class OrderController extends BaseController {
Order order = null;
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("order_number", orderNumber);
if (userIds.size() != 0) {
wrapper.in("hehuoren_id", userIds);
}
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
wrapper.eq("order_status", "待配送");
wrapper.eq("hehuoren_area", "本部");
wrapper.eq("is_delivery","2"); //只能更新分公司配送订单
}
......@@ -1611,13 +1621,14 @@ public class OrderController extends BaseController {
map1.put("idCardUrl1", orderData.getIdCardz());
map1.put("idCardUrl2", orderData.getIdCardf());
map1.put("idCardUrl3", orderData.getIdCardzs());
map1.put("idCardUrl4", orderData.getStudenCard());
map1.put("cardType", orderData.getKapin());
if(orderData.getPackageId().equals("49")){
if (orderData.getPackageId().equals("49")) {
map1.put("userName", orderData.getParentName());
}else{
map1.put("idCardUrl4", orderData.getIdCardzs());
} else {
map1.put("userName", orderData.getCustomerName());
map1.put("idCardUrl4", orderData.getStudenCard());
}
map1.put("linkPhone", orderData.getContactNumber());
map1.put("idCard", orderData.getIdCard());
......
service-manager/src/main/java/com/winsun/controller/supervisorController.java
......@@ -333,7 +333,6 @@ public class supervisorController extends BaseController {
YsmUser ysmUser = ysmUserMapper.selectById(s);
Map<String, Object> map = new HashMap<>();
map.put("ysmUser", ysmUser.getUserName());
map.put("userName", order.getCustomerName());// 客户姓名，必填// 联系人，必填
map.put("linkPhone", order.getContactNumber());// 客户(代办人)电话，必填
map.put("idCard", order.getIdCard());
String[] split = order.getSite().split(" ");
......@@ -347,7 +346,13 @@ public class supervisorController extends BaseController {
map.put("imgUrl1", order.getIdCardz());
map.put("imgUrl2", order.getIdCardf());
map.put("imgUrl3", order.getIdCardzs());
map.put("imgUrl4", order.getIdCardzs());
if (order.getPackageId().equals("49")) {
map.put("userName", order.getParentName());
map.put("idCardUrl4", order.getIdCardzs());
} else {
map.put("userName", order.getCustomerName());// 客户姓名，必填// 联系人，必填
map.put("idCardUrl4", order.getStudenCard());
}
map.put("sign", ysmUser.getSign());
map.put("cardType",order.getKapin());
try {
......
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