Skip to content

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

移动清单导出字段修改+快递员本地配送

parent 7dabd3ce
Showing with 298 additions and 110 deletions
common/src/main/java/com/winsun/bean/Order.java
...@@ -164,6 +164,12 @@ public class Order implements Serializable{ ...@@ -164,6 +164,12 @@ public class Order implements Serializable{
private String kuaidiOrder; private String kuaidiOrder;
/** /**
* 快递时间
*/
@TableField(value = "kuaidi_time")
private Date kuaidiTime;
/**
* 省市县 * 省市县
*/ */
@TableField(value = "site") @TableField(value = "site")
......
common/src/main/java/com/winsun/constant/DeliveryType.java 0 → 100644
package com.winsun.constant;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
* 配送方式
* @author chenhaojian
* @datetime 2021-07-28 11:11
*/
public enum DeliveryType {
SELFMENTION("0","送货上门"), // 自提
PROVINCIALCOMPANY("1","省仓配送"), // 省仓配送
BTANCHOFFICE("2","本地配送"); // 分公司配送
DeliveryType(String id, String name) {
this.id = id;
this.name = name;
};
private static final Map<String, DeliveryType> DATAS = new HashMap<>();
static {
Arrays.asList(values()).forEach(data -> DATAS.put(data.getId(), data));
}
private String id;
private String name;
public String getId() {
return id;
}
public String getName() {
return name;
}
public static DeliveryType findById(String id) {
return DATAS.getOrDefault(id, null);
}
}
common/src/main/java/com/winsun/constant/ExamineType.java 0 → 100644
package com.winsun.constant;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
/**
* 审核类型
* @author chenhaojian
* @datetime 2021-07-28 11:23
*/
public enum ExamineType {
// 0 审核不通过，1 审核通过，空为未审核
AUDITFAILED("0","审核不通过"),
APPROVED("1","审核通过"),
NOTAPPROVED("","未审核");
ExamineType(String id, String name) {
this.id = id;
this.name = name;
};
private static final Map<String, ExamineType> DATAS = new HashMap<>();
static {
Arrays.asList(values()).forEach(data -> DATAS.put(data.getId(), data));
}
private String id;
private String name;
public String getId() {
return id;
}
public String getName() {
return name;
}
public static ExamineType findById(String id) {
return DATAS.getOrDefault(id, null);
}
}
common/src/main/java/com/winsun/mapper/OrderMapper.java
...@@ -41,11 +41,11 @@ public interface OrderMapper extends BaseMapper<Order> { ...@@ -41,11 +41,11 @@ public interface OrderMapper extends BaseMapper<Order> {
@Param("acceptName") String acceptName,@Param("acceptResult") String acceptResult, @Param("acceptName") String acceptName,@Param("acceptResult") String acceptResult,
@Param("acceptDate") Date acceptDate,@Param("successTime")Date successTime); @Param("acceptDate") Date acceptDate,@Param("successTime")Date successTime);
@Update("update `hhr_order` set order_status = #{orderStatus},company = #{company},kuaidi_order = #{kuaidiOrder},send_type = #{sendType} where order_number = #{orderNumber}") @Update("update `hhr_order` set order_status = #{orderStatus},company = #{company},kuaidi_order = #{kuaidiOrder},send_type = #{sendType},kuaidi_time = #{kuaidiTime},business_iccid = #{businessIccid} where order_number = #{orderNumber}")
Integer updateOrderKDNotNull(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus); Integer updateOrderKDNotNull(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus,@Param("kuaidiTime")Date kuaidiTime,@Param("businessIccid")String businessIccid);
@Update("update `hhr_order` set order_status = #{orderStatus},company = #{company},kuaidi_order = #{kuaidiOrder},send_type = #{sendType},success_time=#{successTime} where order_number = #{orderNumber}") @Update("update `hhr_order` set order_status = #{orderStatus},company = #{company},kuaidi_order = #{kuaidiOrder},send_type = #{sendType},success_time=#{successTime},kuaidi_time =#{kuaidiTime},business_iccid =#{businessIccid} where order_number = #{orderNumber}")
Integer updateOrderKDIsNotNullByTime(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus,@Param("successTime")Date successTime); Integer updateOrderKDIsNotNullByTime(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus,@Param("successTime")Date successTime,@Param("kuaidiTime")Date kuaidiTime,@Param("businessIccid")String businessIccid);
@Update("update `hhr_order` set order_status = #{orderStatus},send_type = #{sendType} where order_number = #{orderNumber}") @Update("update `hhr_order` set order_status = #{orderStatus},send_type = #{sendType} where order_number = #{orderNumber}")
......
common/src/main/java/com/winsun/smsUtils/SendSmsAndMail.java
...@@ -87,11 +87,11 @@ public class SendSmsAndMail { ...@@ -87,11 +87,11 @@ public class SendSmsAndMail {
requestData.put("smsTemplateId", "00RFwbnkDsZM");// 短信模板id 创建成功 requestData.put("smsTemplateId", "00RFwbnkDsZM");// 短信模板id 创建成功
requestData.put("data", "{}"); // 数据 requestData.put("data", "{}"); // 数据
}else if(t.equals("13")){ }else if(t.equals("13")){
//【飞young校园】同学您好，经系统核查，您满足升级为每月70G大流量新套餐的条件，请在1月25日24点前点击“广航D人”公众号菜单栏“校园功能”“升级套餐”办理升级。本优惠将于1月25日24点截止，请尽快在公众号登记。 //【飞young校园】尊敬的用户，您满足升级为每月28元享70G大流量套餐。请1月16日24点前关注“@_name_@”菜单栏“升级套餐”参与。详情咨询广州小young客服！本活动将于1月16日24点截止！
requestData.put("smsTemplateId", "00RqWcH8X1LE");// 短信模板id 创建成功 requestData.put("smsTemplateId", "00RqWcH8X1LE");// 短信模板id 创建成功
requestData.put("data", "{\"name\":\"" + preurl + "\"}"); // 数据 requestData.put("data", "{\"name\":\"" + preurl + "\"}"); // 数据
}else if(t.equals("14")){ }else if(t.equals("14")){
//【飞young校园】同学您好，经系统核查，您满足升级为每月70G大流量新套餐的条件，请在1月25日24点前点击“广航D人”公众号菜单栏“校园功能”“升级套餐”办理升级。本优惠将于1月25日24点截止，请尽快在公众号登记。 //【飞young校园】尊敬的用户：您的校园宽带开通失败，详细原因可向学校网络中心咨询，协商解决后重新下单，祝您生活愉快！
requestData.put("smsTemplateId", "00UbC7MEwyGW");// 短信模板id 创建成功 requestData.put("smsTemplateId", "00UbC7MEwyGW");// 短信模板id 创建成功
requestData.put("data", "{}"); // 数据 requestData.put("data", "{}"); // 数据
} }
...@@ -136,7 +136,7 @@ public class SendSmsAndMail { ...@@ -136,7 +136,7 @@ public class SendSmsAndMail {
requestData.put("smsTemplateId", "00OKpX6Mmvwm");// 短信模板id 创建成功 requestData.put("smsTemplateId", "00OKpX6Mmvwm");// 短信模板id 创建成功
requestData.put("data", "{\"speed\":\"" + speed + "\",\"name\":\""+name+"\"}"); // 数据 requestData.put("data", "{\"speed\":\"" + speed + "\",\"name\":\""+name+"\"}"); // 数据
}else if(t.equals("11")){ }else if(t.equals("11")){
//【飞young校园】尊敬的用户：您好，您已具备校园网提速的条件，您的校园网可提速为 @_speed_@ ，具体操作步骤可关注微信公众号“ @_name_@ ”咨询。 //【飞young校园】尊敬的用户，您的订单已受理成功！按照国家实名制规定，请您收到手机卡后尽快进行实名激活。快递公司：@_company_@；单号：@_kuaidi_order_@
requestData.put("smsTemplateId", "00QiOt2Pjygy");// 短信模板id 创建成功 requestData.put("smsTemplateId", "00QiOt2Pjygy");// 短信模板id 创建成功
requestData.put("data", "{\"company\":\"" + speed + "\",\"kuaidi_order\":\""+name+"\"}"); // 数据 requestData.put("data", "{\"company\":\"" + speed + "\",\"kuaidi_order\":\""+name+"\"}"); // 数据
}else if(t.equals("12")){ }else if(t.equals("12")){
......
common/src/main/java/com/winsun/utils/XbkUtil.java
...@@ -60,10 +60,8 @@ public class XbkUtil { ...@@ -60,10 +60,8 @@ public class XbkUtil {
map.put("coUserId", netId); map.put("coUserId", netId);
map.put("phoneNumber", businessNumber); map.put("phoneNumber", businessNumber);
map.put("isDelivery", isDelivery); map.put("isDelivery", isDelivery);
if("1".equals(isDelivery)){
map.put("sendCityCode", sendCityCode); map.put("sendCityCode", sendCityCode);
map.put("custAffress", custAffress); map.put("custAffress", custAffress);
}
map.put("custName", customerName); map.put("custName", customerName);
map.put("idCardNo", idCard); map.put("idCardNo", idCard);
map.put("contactNumber", contactNumber); map.put("contactNumber", contactNumber);
......
core-service/src/main/java/com/winsun/item/modular/system/controller/GetPhoneCodeController.java
...@@ -65,6 +65,7 @@ public class GetPhoneCodeController extends BaseController { ...@@ -65,6 +65,7 @@ public class GetPhoneCodeController extends BaseController {
username = usernameDecrypt.getData(); username = usernameDecrypt.getData();
EntityWrapper<User> userwrapper = new EntityWrapper<>(); EntityWrapper<User> userwrapper = new EntityWrapper<>();
userwrapper.eq("account", username); userwrapper.eq("account", username);
userwrapper.eq("status", "1");;
List<User> users = userService.selectList(userwrapper); List<User> users = userService.selectList(userwrapper);
if (CollectionUtils.isEmpty(users)) { if (CollectionUtils.isEmpty(users)) {
return ResponseEntity.newJSON("code", 400, "message", "密码或者账号错误！"); return ResponseEntity.newJSON("code", 400, "message", "密码或者账号错误！");
......
new-user/src/main/java/com/winsun/controller/PackageNewClothes.java
...@@ -517,7 +517,6 @@ public class PackageNewClothes { ...@@ -517,7 +517,6 @@ public class PackageNewClothes {
// jsonObject = JSONObject.parseObject("{\"dataArray\":{\"salesName\":\"29元学霸星卡\",\"createTime\":\"2021-02-26 09:09:16\",\"orderStatus\":\"17\",\"coUserId\":\"245048\",\"orderCode\":\"120210226090852004565\",\"realPrice\":\"50.0\"},\"msg\":\"操作成功\",\"code\":\"0\",\"errorDescription\":\"\"}"); // jsonObject = JSONObject.parseObject("{\"dataArray\":{\"salesName\":\"29元学霸星卡\",\"createTime\":\"2021-02-26 09:09:16\",\"orderStatus\":\"17\",\"coUserId\":\"245048\",\"orderCode\":\"120210226090852004565\",\"realPrice\":\"50.0\"},\"msg\":\"操作成功\",\"code\":\"0\",\"errorDescription\":\"\"}");
jsonObject = XbkUtil.xbkOrderJT0002(businessNumber, idCard, jsonObject = XbkUtil.xbkOrderJT0002(businessNumber, idCard,
customerName, contactNumber, xbId, netId, code, address,isDelivery); customerName, contactNumber, xbId, netId, code, address,isDelivery);
log.info("小白卡下单接口调用返回:"+jsonObject.toJSONString());
} catch (Exception e) { } catch (Exception e) {
log.error("小白卡下单接口调用异常", e.getMessage()); log.error("小白卡下单接口调用异常", e.getMessage());
} }
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -15,6 +15,8 @@ import com.winsun.auth.core.shiro.ShiroUser; ...@@ -15,6 +15,8 @@ import com.winsun.auth.core.shiro.ShiroUser;
import com.winsun.auth.core.util.IOUtils; import com.winsun.auth.core.util.IOUtils;
import com.winsun.bean.Package; import com.winsun.bean.Package;
import com.winsun.bean.*; import com.winsun.bean.*;
import com.winsun.constant.DeliveryType;
import com.winsun.constant.ExamineType;
import com.winsun.constant.FilePath; import com.winsun.constant.FilePath;
import com.winsun.constant.UserType; import com.winsun.constant.UserType;
import com.winsun.mapper.*; import com.winsun.mapper.*;
...@@ -87,12 +89,17 @@ public class OrderController extends BaseController { ...@@ -87,12 +89,17 @@ public class OrderController extends BaseController {
private static String SL_ACCEPTNAME = "受理人(必填)"; private static String SL_ACCEPTNAME = "受理人(必填)";
private static String SL_ACCERPCOMMENT = "备注（受理不成功需填写不成功原因）"; private static String SL_ACCERPCOMMENT = "备注（受理不成功需填写不成功原因）";
/** /**
* 快递清单模板列名 * 快递清单模板列名 订单编号 客户姓名 联系号码 合伙人学校 快递单号 白卡ICCID
*/ */
private static String KD_ORDERNUMBER = "订单编号(必填)"; private static String KD_ORDERNUMBER = "订单编号(必填)";
private static String SL_SENDTYPE = "快递方式(必填)"; private static String KD_SENDTYPE = "快递方式(必填)";
private static String SL_COMPANY = "快递公司(快递方式为快递必须填写)"; private static String KD_COMPANY = "快递公司(快递方式为快递必须填写)";
private static String SL_KUAIDORDER = "快递单号(快递方式为快递必须填写)"; private static String KD_KUAIDORDER = "快递单号(必填)";
private static String KD_CONTACTNAME = "客户姓名";
private static String KD_CONTACTNUMBER = "联系号码";
private static String KD_HEHUORENSCHOOL = "合伙人学校";
private static String KD_BUSINESSICCID = "白卡ICCID(必填)";
/** /**
* 预制卡清单模板列名 * 预制卡清单模板列名
...@@ -195,9 +202,10 @@ public class OrderController extends BaseController { ...@@ -195,9 +202,10 @@ public class OrderController extends BaseController {
// 小白卡修改为待配送状态 // 小白卡修改为待配送状态
// 上门则改为待活体 // 上门则改为待活体
order.setOrderStatus("待配送"); order.setOrderStatus("待配送");
if ("送货上门".equals(sendType)) { // 由于业务需求，暂不允许“送货上门”
order.setOrderStatus("待活体"); // if ("送货上门".equals(sendType)) {
} // order.setOrderStatus("待活体");
// }
}else if(packageInfo.getIsXbCard() == 1){ }else if(packageInfo.getIsXbCard() == 1){
//预制卡 改为待选号 //预制卡 改为待选号
order.setOrderStatus("待选号"); order.setOrderStatus("待选号");
...@@ -448,10 +456,14 @@ public class OrderController extends BaseController { ...@@ -448,10 +456,14 @@ public class OrderController extends BaseController {
@RequestParam(name = "successTimeStart", required = false) String successTimeStart, @RequestParam(name = "successTimeStart", required = false) String successTimeStart,
@RequestParam(name = "successTimeEnd", required = false) String successTimeEnd, @RequestParam(name = "successTimeEnd", required = false) String successTimeEnd,
@RequestParam("userType") String userType, @RequestParam("userType") String userType,
@RequestParam(name = "orderNumber", required = false) String orderNumber, @RequestParam(name = "kapin", required = false) String kapin, @RequestParam(name = "orderNumber", required = false) String orderNumber,
@RequestParam(name = "businessNumber", required = false) String businessNumber, @RequestParam(name = "contactNumber", required = false) String contactNumber, @RequestParam(name = "kapin", required = false) String kapin,
@RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool, @RequestParam(name = "hehuorenName", required = false) String hehuorenName, @RequestParam(name = "businessNumber", required = false) String businessNumber,
@RequestParam(name = "orderStatus", required = false) String orderStatus,@RequestParam(name = "hehuorenArea", required = false) String hehuorenArea, @RequestParam(name = "contactNumber", required = false) String contactNumber,
@RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool,
@RequestParam(name = "hehuorenName", required = false) String hehuorenName,
@RequestParam(name = "orderStatus", required = false) String orderStatus,
@RequestParam(name = "hehuorenArea", required = false) String hehuorenArea,
@RequestParam(name = "customerName", required = false) String customerName, @RequestParam(name = "customerName", required = false) String customerName,
@RequestParam(name = "orderId", required = false)String orderId, @RequestParam(name = "orderId", required = false)String orderId,
@RequestParam(name = "xbOrderId", required = false) String xbOrderId, @RequestParam(name = "xbOrderId", required = false) String xbOrderId,
...@@ -499,12 +511,11 @@ public class OrderController extends BaseController { ...@@ -499,12 +511,11 @@ public class OrderController extends BaseController {
} }
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) { if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
wrapper.eq("order_status", "待配送"); wrapper.in("order_status", "待配送,待活体,已完成");
wrapper.isNotNull("order_id").or().eq("is_delivery","2"); wrapper.eq("is_delivery","2");
}
}else{
wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus).orderBy("create_time",false); wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus).orderBy("create_time",false);
}
Page<Order> page = new Page<>(pageNo, pageSize); Page<Order> page = new Page<>(pageNo, pageSize);
...@@ -686,11 +697,16 @@ public class OrderController extends BaseController { ...@@ -686,11 +697,16 @@ public class OrderController extends BaseController {
@Permission(menuname = "导出订单", value = "download", method = RequestMethod.POST) @Permission(menuname = "导出订单", value = "download", method = RequestMethod.POST)
public ResponseData<String> downloadOrderView( public ResponseData<String> downloadOrderView(
@RequestParam(name = "createTimeStart", required = false) String createTimeStart, @RequestParam(name = "createTimeStart", required = false) String createTimeStart,
@RequestParam(name = "createTimeEnd", required = false) String createTimeEnd, @RequestParam(name = "successTimeStart", required = false) String successTimeStart, @RequestParam(name = "createTimeEnd", required = false) String createTimeEnd,
@RequestParam(name = "successTimeEnd", required = false) String successTimeEnd, @RequestParam("userType") String userType, @RequestParam(name = "successTimeStart", required = false) String successTimeStart,
@RequestParam(name = "orderNumber", required = false) String orderNumber, @RequestParam(name = "kapin", required = false) String kapin, @RequestParam(name = "successTimeEnd", required = false) String successTimeEnd,
@RequestParam(name = "businessNumber", required = false) String businessNumber, @RequestParam(name = "contactNumber", required = false) String contactNumber, @RequestParam("userType") String userType,
@RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool, @RequestParam(name = "hehuorenName", required = false) String hehuorenName, @RequestParam(name = "orderNumber", required = false) String orderNumber,
@RequestParam(name = "kapin", required = false) String kapin,
@RequestParam(name = "businessNumber", required = false) String businessNumber,
@RequestParam(name = "contactNumber", required = false) String contactNumber,
@RequestParam(name = "hehuorenSchool", required = false) String hehuorenSchool,
@RequestParam(name = "hehuorenName", required = false) String hehuorenName,
@RequestParam(name = "orderStatus", required = false) String orderStatus, @RequestParam(name = "orderStatus", required = false) String orderStatus,
@RequestParam(name = "customerName", required = false) String customerName, @RequestParam(name = "customerName", required = false) String customerName,
@RequestParam(name = "businessPackage", required = false) String businessPackage) { @RequestParam(name = "businessPackage", required = false) String businessPackage) {
...@@ -752,7 +768,7 @@ public class OrderController extends BaseController { ...@@ -752,7 +768,7 @@ public class OrderController extends BaseController {
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) { if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
map.put("orderStatus", "待配送"); map.put("orderStatus", "待配送");
map.put("hehuorenArea", "本部"); map.put("hehuorenArea", "本部");
map.put("isYzk", true); map.put("isDelivery", 2);
} }
try { try {
...@@ -825,7 +841,17 @@ public class OrderController extends BaseController { ...@@ -825,7 +841,17 @@ public class OrderController extends BaseController {
if (map.containsKey("isYzk")) { if (map.containsKey("isYzk")) {
isYzk = true; isYzk = true;
} }
String isDelivery = "";
if (map.containsKey("isDelivery")) {
isDelivery = map.get("isDelivery").toString();
}
EntityWrapper<Order> wrapper = new EntityWrapper(); 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, " +
"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"); wrapper.notIn( "user_type", "3,5,9,10");
wrapper.ge(StringUtils.isNotBlank(createTimeStart), "create_time", createTimeStart); wrapper.ge(StringUtils.isNotBlank(createTimeStart), "create_time", createTimeStart);
wrapper.le(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd); wrapper.le(StringUtils.isNotBlank(createTimeEnd), "create_time", createTimeEnd);
...@@ -834,7 +860,7 @@ public class OrderController extends BaseController { ...@@ -834,7 +860,7 @@ public class OrderController extends BaseController {
wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType); wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType);
wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber); 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.isNotNull(isYzk, "order_id");
wrapper.eq(StringUtils.isNotBlank(hehuorenArea), "hehuoren_area", hehuorenArea); wrapper.eq(StringUtils.isNotBlank(hehuorenArea), "hehuoren_area", hehuorenArea);
wrapper.eq(StringUtils.isNotBlank(customerName), "customer_name", customerName); wrapper.eq(StringUtils.isNotBlank(customerName), "customer_name", customerName);
wrapper.eq(StringUtils.isNotBlank(businessNumber), "business_number", businessNumber); wrapper.eq(StringUtils.isNotBlank(businessNumber), "business_number", businessNumber);
...@@ -843,47 +869,66 @@ public class OrderController extends BaseController { ...@@ -843,47 +869,66 @@ public class OrderController extends BaseController {
wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(businessPackage), "business_package", businessPackage, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(businessPackage), "business_package", businessPackage, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus); wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus);
List<Map<String, Object>> Orders = orderMapper.downloadOrder(wrapper); wrapper.eq(StringUtils.isNotBlank(isDelivery), "is_delivery", isDelivery);
List<Map<String, Object>> Orders = orderMapper.selectMaps(wrapper);
List<String> tops = new ArrayList<>(); List<String> tops = new ArrayList<>();
tops.add("客户姓名"); tops.add("客户姓名");
tops.add("订单编号");
tops.add("联系号码");
tops.add("办理号码"); tops.add("办理号码");
tops.add("办理套餐"); tops.add("订单状态");
tops.add("合伙人姓名"); tops.add("订单创建时间");
tops.add("县分");
tops.add("合伙人学校"); tops.add("合伙人学校");
tops.add("合伙人姓名");
tops.add("合伙人手机"); tops.add("合伙人手机");
tops.add("现有套餐"); tops.add("督导");
tops.add("升级套餐");
tops.add("创建时间");
tops.add("受理时间");
tops.add("揽装人");
tops.add("揽装工号");
tops.add("订单状态");
tops.add("订单类型"); tops.add("订单类型");
// tops.add("地区"); tops.add("办理套餐");
// tops.add("地址"); tops.add("升级套餐");
// tops.add("学生证审核状态"); tops.add("联系号码");
tops.add("订单编号");
tops.add("小白卡单号");
tops.add("收货地区");
tops.add("详细地址");
tops.add("配送方式");
tops.add("快递公司");
tops.add("快递单号");
tops.add("白卡ICCID");
tops.add("快递寄出时间");
tops.add("订单完成时间");
tops.add("用户学校");
tops.add("学生证审核");
tops.add("父母名字");
tops.add("学号");
tops.add("班级");
List<String> columns = new ArrayList<>(); List<String> columns = new ArrayList<>();
columns.add("customer_name"); columns.add("customer_name");
columns.add("order_number");
columns.add("contact_number");
columns.add("business_number"); columns.add("business_number");
columns.add("kapin"); columns.add("order_status");
columns.add("hehuoren_name"); columns.add("create_time");
columns.add("hehuoren_area");
columns.add("hehuoren_school"); columns.add("hehuoren_school");
columns.add("hehuoren_name");
columns.add("hehuoren_phone"); columns.add("hehuoren_phone");
columns.add("supervisor_name");
columns.add("user_type");
columns.add("now_package"); columns.add("now_package");
columns.add("business_package"); columns.add("business_package");
columns.add("create_time"); columns.add("contact_number");
columns.add("accept_date"); columns.add("order_number");
columns.add("lz_user"); columns.add("xb_order_id");
columns.add("lzgh"); columns.add("site");
columns.add("order_status"); columns.add("address");
columns.add("user_type"); columns.add("is_delivery");
// columns.add("site"); columns.add("company");
// columns.add("address"); columns.add("kuaidi_order");
// columns.add("student_card_checkStatus"); columns.add("business_iccid");
columns.add("kuaidi_time");
columns.add("success_time");
columns.add("userSchool");
columns.add("student_card_check_status");
columns.add("parent_name");
columns.add("student_number");
columns.add("class_number");
ServletOutputStream os = null; ServletOutputStream os = null;
XSSFWorkbook workbook = new XSSFWorkbook(); XSSFWorkbook workbook = new XSSFWorkbook();
try { try {
...@@ -909,6 +954,18 @@ public class OrderController extends BaseController { ...@@ -909,6 +954,18 @@ public class OrderController extends BaseController {
sheet.setColumnWidth(14, 6500); sheet.setColumnWidth(14, 6500);
sheet.setColumnWidth(15, 6500); sheet.setColumnWidth(15, 6500);
sheet.setColumnWidth(16, 6500); sheet.setColumnWidth(16, 6500);
sheet.setColumnWidth(17, 6500);
sheet.setColumnWidth(18, 6500);
sheet.setColumnWidth(19, 4000);
sheet.setColumnWidth(20, 6500);
sheet.setColumnWidth(21, 6500);
sheet.setColumnWidth(22, 6500);
sheet.setColumnWidth(23, 6500);
sheet.setColumnWidth(24, 6500);
sheet.setColumnWidth(25, 6500);
sheet.setColumnWidth(26, 6500);
sheet.setColumnWidth(27, 6500);
sheet.setColumnWidth(28, 6500);
//第一行字段名称 //第一行字段名称
tops.forEach(column -> { tops.forEach(column -> {
XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0)); XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
...@@ -924,6 +981,15 @@ public class OrderController extends BaseController { ...@@ -924,6 +981,15 @@ public class OrderController extends BaseController {
maps.put("lzgh",school.getLzgh()); maps.put("lzgh",school.getLzgh());
String userTypeSrt = UserType.findById(maps.get("user_type").toString()).getName(); String userTypeSrt = UserType.findById(maps.get("user_type").toString()).getName();
maps.put("user_type",userTypeSrt); maps.put("user_type",userTypeSrt);
if(maps.get("is_delivery") != null && StringUtils.isNotBlank(maps.get("is_delivery").toString())){
String isDeliveryStr = DeliveryType.findById(maps.get("is_delivery").toString()).getName();
maps.put("is_delivery",isDeliveryStr);
}
if(maps.get("student_card_check_status") != null && StringUtils.isNotBlank(maps.get("student_card_check_status").toString())) {
String studentCardCheckStatusStr = ExamineType.findById(maps.get("student_card_check_status").toString()).getName();
maps.put("student_card_check_status",studentCardCheckStatusStr);
}
final XSSFRow rowdata = sheet.createRow(++rowIndex); final XSSFRow rowdata = sheet.createRow(++rowIndex);
for (String column : columns) { for (String column : columns) {
XSSFCell cell = rowdata.createCell(Math.max(rowdata.getLastCellNum(), 0)); XSSFCell cell = rowdata.createCell(Math.max(rowdata.getLastCellNum(), 0));
...@@ -1260,22 +1326,35 @@ public class OrderController extends BaseController { ...@@ -1260,22 +1326,35 @@ public class OrderController extends BaseController {
if (listMap.size() == 0) { if (listMap.size() == 0) {
return ResponseData.error("文件不能为空"); return ResponseData.error("文件不能为空");
} }
if (listMap.get(0).size() != 4) { if (listMap.get(0).size() != 6) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("a").toString().equals(KD_ORDERNUMBER)) { if (!listMap.get(0).get("a").toString().equals(KD_ORDERNUMBER)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("b").toString().equals(SL_SENDTYPE)) { if (!listMap.get(0).get("b").toString().equals(KD_CONTACTNAME)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("c").toString().equals(SL_COMPANY)) { if (!listMap.get(0).get("c").toString().equals(KD_CONTACTNUMBER)) {
return ResponseData.error("模板不对，请选择正确的模板！"); return ResponseData.error("模板不对，请选择正确的模板！");
} }
if (!listMap.get(0).get("d").toString().equals(SL_KUAIDORDER)) { 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)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
if (!listMap.get(0).get("f").toString().equals(KD_BUSINESSICCID)) {
return ResponseData.error("模板不对，请选择正确的模板！");
}
/*
订单编号 order_number KD_ORDERNUMBER
客户姓名 customer_name KD_CONTACTNAME
联系号码 contact_number KD_CONTACTNUMBER
合伙人学校 hehuoren_school KD_HEHUORENSCHOOL
快递单号 kuaidi_order KD_KUAIDORDER
白卡ICCID business_iccid KD_BUSINESSICCID
*/
//校验数据 //校验数据
try { try {
//校验数据 //校验数据
...@@ -1287,25 +1366,17 @@ public class OrderController extends BaseController { ...@@ -1287,25 +1366,17 @@ public class OrderController extends BaseController {
if (StringUtils.isBlank(temp.get("a").toString())) { if (StringUtils.isBlank(temp.get("a").toString())) {
return ResponseData.error("第" + (i + 1) + "行的订单编号不能为空"); return ResponseData.error("第" + (i + 1) + "行的订单编号不能为空");
} }
if (!temp.containsKey("b")) { if (!temp.containsKey("e")) {
return ResponseData.error("第" + (i + 1) + "行的快递方式不能为空");
}
if (StringUtils.isBlank(temp.get("b").toString())) {
return ResponseData.error("第" + (i + 1) + "行的快递方式不能为空");
}
if ("快递".equals(temp.get("b").toString())) {
if (!temp.containsKey("c")) {
return ResponseData.error("第" + (i + 1) + "行的快递公司不能为空");
}
if (!temp.containsKey("d")) {
return ResponseData.error("第" + (i + 1) + "行的快递单号不能为空"); return ResponseData.error("第" + (i + 1) + "行的快递单号不能为空");
} }
if (StringUtils.isBlank(temp.get("c").toString())) { if (StringUtils.isBlank(temp.get("e").toString())) {
return ResponseData.error("第" + (i + 1) + "行的快递公司不能为空");
}
if (StringUtils.isBlank(temp.get("d").toString())) {
return ResponseData.error("第" + (i + 1) + "行的快递单号不能为空"); return ResponseData.error("第" + (i + 1) + "行的快递单号不能为空");
} }
if (!temp.containsKey("f")) {
return ResponseData.error("第" + (i + 1) + "行的白卡ICCID不能为空");
}
if (StringUtils.isBlank(temp.get("f").toString())) {
return ResponseData.error("第" + (i + 1) + "行的白卡ICCID不能为空");
} }
} }
//检查excel表中是否有重复人员编号 //检查excel表中是否有重复人员编号
...@@ -1324,17 +1395,25 @@ public class OrderController extends BaseController { ...@@ -1324,17 +1395,25 @@ public class OrderController extends BaseController {
} }
int number = 0; int number = 0;
Date successTime = null; Date successTime = null;
Date kuaidiTime = null;
for (int i = 1; i < listMap.size(); i++) { for (int i = 1; i < listMap.size(); i++) {
successTime = new Date(); successTime = new Date();
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 = map.get("b").toString(); String sendType = "快递";
String company = null; String company = "邮政EMS";
String kuaidiOrder = null; String kuaidiOrder = map.get("e").toString();
String businessIccid = map.get("f").toString();
String orderStatus = null; String orderStatus = null;
Order order = null; Order order = null;
Wrapper<Order> wrapper = new EntityWrapper<>(); Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("order_number", orderNumber); wrapper.eq("order_number", orderNumber);
if (user.getRoleNames().stream().anyMatch(roleName -> StringUtils.equalsAny(roleName, "快递公司"))) {
wrapper.eq("order_status", "待配送");
wrapper.eq("hehuoren_area", "本部");
wrapper.eq("is_delivery","2"); //只能更新分公司配送订单
}
List<Order> orders = orderMapper.selectList(wrapper); List<Order> orders = orderMapper.selectList(wrapper);
if (orders != null && orders.size() == 1) { if (orders != null && orders.size() == 1) {
order = orders.get(0); order = orders.get(0);
...@@ -1345,20 +1424,16 @@ public class OrderController extends BaseController { ...@@ -1345,20 +1424,16 @@ public class OrderController extends BaseController {
if (StringUtils.isNotBlank(order.getXbOrderId())) { if (StringUtils.isNotBlank(order.getXbOrderId())) {
orderStatus = "待活体"; orderStatus = "待活体";
kuaidiTime = new Date();
successTime = null; successTime = null;
} else { } else {
orderStatus = "已完成"; orderStatus = "已完成";
// 存销售清单 todo // 存销售清单
insertCompleteOrder(order); insertCompleteOrder(order);
} }
if ("快递".equals(map.get("b").toString())) {
company = map.get("c").toString();
kuaidiOrder = map.get("d").toString();
log.info("联系号码：" + order.getContactNumber()); log.info("联系号码：" + order.getContactNumber());
// 发送短信
SendSmsAndMail.sendSms2(order.getContactNumber(), company, kuaidiOrder, "11");
}
Integer integer = null; Integer integer = null;
if (StringUtils.isBlank(company) || StringUtils.isBlank(kuaidiOrder)) { if (StringUtils.isBlank(company) || StringUtils.isBlank(kuaidiOrder)) {
if(successTime == null){ if(successTime == null){
...@@ -1368,20 +1443,21 @@ public class OrderController extends BaseController { ...@@ -1368,20 +1443,21 @@ public class OrderController extends BaseController {
} }
} else { } else {
if(successTime == null){ if(successTime == null){
integer = orderMapper.updateOrderKDNotNull(orderNumber, company, kuaidiOrder, sendType, orderStatus); integer = orderMapper.updateOrderKDNotNull(orderNumber, company, kuaidiOrder, sendType, orderStatus,kuaidiTime,businessIccid);
}else { }else {
integer = orderMapper.updateOrderKDIsNotNullByTime(orderNumber, company, kuaidiOrder, sendType, orderStatus,successTime); integer = orderMapper.updateOrderKDIsNotNullByTime(orderNumber, company, kuaidiOrder, sendType, orderStatus,successTime,kuaidiTime,businessIccid);
} }
// 发送短信
SendSmsAndMail.sendSms2(order.getContactNumber(), company, kuaidiOrder, "11");
} }
if (integer == 1) { if (integer == 1) {
number++; number++;
String id = orderMapper.selectIdByOrderNumber(orderNumber); String id = orderMapper.selectIdByOrderNumber(orderNumber);
if("快递".equals(map.get("b").toString())) { if("快递".equals(sendType)) {
appMapper.inserOrderHis(id, "发货中，快递公司：" + company + "，快递单号：" + kuaidiOrder, new Date(), user.getName()); appMapper.inserOrderHis(id, "发货中，快递公司：" + company + "，快递单号：" + kuaidiOrder, new Date(), user.getName());
}else{ }else{
appMapper.inserOrderHis(id, "发货中，快递方式：" + sendType, new Date(), user.getName()); appMapper.inserOrderHis(id, "发货中，快递方式：" + sendType, new Date(), user.getName());
} }
} else { } else {
error.append("第" + (i + 1) + "行的更新失败,"); error.append("第" + (i + 1) + "行的更新失败,");
} }
...@@ -1792,24 +1868,37 @@ public class OrderController extends BaseController { ...@@ -1792,24 +1868,37 @@ public class OrderController extends BaseController {
@Permission(menuname = "快递导入模板", method = RequestMethod.POST, value = "downloadMoBanKD") @Permission(menuname = "快递导入模板", method = RequestMethod.POST, value = "downloadMoBanKD")
public ResponseData downloadMoBanKD() { public ResponseData downloadMoBanKD() {
ArrayList<String> columns = new ArrayList<>(); ArrayList<String> columns = new ArrayList<>();
/*
订单编号 order_number KD_ORDERNUMBER
客户姓名 customer_name KD_CONTACTNAME
联系号码 contact_number KD_CONTACTNUMBER
合伙人学校 hehuoren_school KD_HEHUORENSCHOOL
快递单号 kuaidi_order KD_KUAIDORDER
白卡ICCID business_iccid KD_BUSINESSICCID
*/
columns.add(KD_ORDERNUMBER); columns.add(KD_ORDERNUMBER);
columns.add(SL_SENDTYPE); columns.add(KD_CONTACTNAME);
columns.add(SL_COMPANY); columns.add(KD_CONTACTNUMBER);
columns.add(SL_KUAIDORDER); columns.add(KD_HEHUORENSCHOOL);
columns.add(KD_KUAIDORDER);
columns.add(KD_BUSINESSICCID);
ServletOutputStream os = null; ServletOutputStream os = null;
XSSFWorkbook workbook = new XSSFWorkbook(); XSSFWorkbook workbook = new XSSFWorkbook();
try { try {
//创建工作表 //创建工作表
XSSFSheet sheet = workbook.createSheet("快递清单"); XSSFSheet sheet = workbook.createSheet("快递导入模板");
sheet.setColumnWidth(0, 5000); sheet.setColumnWidth(0, 5000);
sheet.setColumnWidth(2, 9000);
sheet.setColumnWidth(1, 4000); sheet.setColumnWidth(1, 4000);
sheet.setColumnWidth(3, 9000); sheet.setColumnWidth(2, 8000);
sheet.setColumnWidth(3, 10000);
sheet.setColumnWidth(4, 9000);
sheet.setColumnWidth(5, 9000);
//下拉选项 //下拉选项
List<String> fengju = new ArrayList<>(); List<String> fengju = new ArrayList<>();
fengju.add("快递"); fengju.add("快递");
fengju.add("送货上门"); // fengju.add("送货上门");
sheet = this.getXSSFSheet(sheet, fengju, 1, 1); // sheet = this.getXSSFSheet(sheet, fengju, 1, 1);
//添加表头 //添加表头
final XSSFRow row = sheet.createRow(0); final XSSFRow row = sheet.createRow(0);
XSSFCellStyle cellStyle = workbook.createCellStyle(); XSSFCellStyle cellStyle = workbook.createCellStyle();
......
task/src/main/java/com/winsun/TimingTask/OrderTask.java
...@@ -181,10 +181,9 @@ public class OrderTask { ...@@ -181,10 +181,9 @@ public class OrderTask {
} }
} }
@Scheduled(cron = "0 0 0 * * ? ") @Scheduled(cron = "0 0 * * * ? ")
//@Scheduled(cron = "0/5 * * * * ? ") //@Scheduled(cron = "0/5 * * * * ? ")
//@Scheduled(fixedRate=1000*60) //@Scheduled(fixedRate=1000*60)
@PostMapping("/orderTask")
public void general() throws ParseException { public void general() throws ParseException {
log.info("更新小白卡订单"); log.info("更新小白卡订单");
Wrapper<Order> wrapper = new EntityWrapper(); Wrapper<Order> wrapper = new EntityWrapper();
......
task/src/main/java/com/winsun/service/ExportService.java
...@@ -112,7 +112,10 @@ public class ExportService extends BaseController { ...@@ -112,7 +112,10 @@ public class ExportService extends BaseController {
if (map.containsKey("isYzk")) { if (map.containsKey("isYzk")) {
isYzk = true; isYzk = true;
} }
String isDelivery = "";
if (map.containsKey("isDelivery")) {
isDelivery = map.get("isDelivery").toString();
}
EntityWrapper<Order> wrapper = new EntityWrapper(); EntityWrapper<Order> wrapper = new EntityWrapper();
wrapper.notIn("user_type", "3,5,9,10"); wrapper.notIn("user_type", "3,5,9,10");
...@@ -123,7 +126,7 @@ public class ExportService extends BaseController { ...@@ -123,7 +126,7 @@ public class ExportService extends BaseController {
wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType); wrapper.eq(StringUtils.isNotBlank(userType), "user_type", userType);
wrapper.eq(StringUtils.isNotBlank(orderNumber), "order_number", orderNumber); 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.isNotNull(isYzk, "order_id");
wrapper.eq(StringUtils.isNotBlank(hehuorenArea), "hehuoren_area", hehuorenArea); wrapper.eq(StringUtils.isNotBlank(hehuorenArea), "hehuoren_area", hehuorenArea);
wrapper.eq(StringUtils.isNotBlank(customerName), "customer_name", customerName); wrapper.eq(StringUtils.isNotBlank(customerName), "customer_name", customerName);
wrapper.eq(StringUtils.isNotBlank(businessNumber), "business_number", businessNumber); wrapper.eq(StringUtils.isNotBlank(businessNumber), "business_number", businessNumber);
...@@ -132,6 +135,7 @@ public class ExportService extends BaseController { ...@@ -132,6 +135,7 @@ public class ExportService extends BaseController {
wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(hehuorenName), "hehuoren_name", hehuorenName, SqlLike.DEFAULT);
wrapper.like(StringUtils.isNotBlank(businessPackage), "business_package", businessPackage, SqlLike.DEFAULT); wrapper.like(StringUtils.isNotBlank(businessPackage), "business_package", businessPackage, SqlLike.DEFAULT);
wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus); wrapper.eq(StringUtils.isNotBlank(orderStatus), "order_status", orderStatus);
wrapper.eq(StringUtils.isNotBlank(isDelivery), "is_delivery", isDelivery);
List<Map<String, Object>> Orders = orderMapper.downloadOrder(wrapper); List<Map<String, Object>> Orders = orderMapper.downloadOrder(wrapper);
List<String> tops = new ArrayList<>(); List<String> tops = new ArrayList<>();
tops.add("客户姓名"); tops.add("客户姓名");
...@@ -150,8 +154,8 @@ public class ExportService extends BaseController { ...@@ -150,8 +154,8 @@ public class ExportService extends BaseController {
tops.add("揽装工号"); tops.add("揽装工号");
tops.add("订单状态"); tops.add("订单状态");
tops.add("订单类型"); tops.add("订单类型");
// tops.add("地区"); tops.add("地区");
// tops.add("地址"); tops.add("地址");
// tops.add("学生证审核状态"); // tops.add("学生证审核状态");
List<String> columns = new ArrayList<>(); List<String> columns = new ArrayList<>();
columns.add("customer_name"); columns.add("customer_name");
...@@ -170,8 +174,8 @@ public class ExportService extends BaseController { ...@@ -170,8 +174,8 @@ public class ExportService extends BaseController {
columns.add("lzgh"); columns.add("lzgh");
columns.add("order_status"); columns.add("order_status");
columns.add("user_type"); columns.add("user_type");
// columns.add("site"); columns.add("site");
// columns.add("address"); columns.add("address");
// columns.add("student_card_checkStatus"); // columns.add("student_card_checkStatus");
SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd"); SimpleDateFormat format = new SimpleDateFormat("yyyyMMdd");
String formatPath = format.format(new Date()); String formatPath = format.format(new Date());
...@@ -208,6 +212,8 @@ public class ExportService extends BaseController { ...@@ -208,6 +212,8 @@ public class ExportService extends BaseController {
sheet.setColumnWidth(14, 6500); sheet.setColumnWidth(14, 6500);
sheet.setColumnWidth(15, 6500); sheet.setColumnWidth(15, 6500);
sheet.setColumnWidth(16, 6500); sheet.setColumnWidth(16, 6500);
sheet.setColumnWidth(17, 6500);
sheet.setColumnWidth(18, 6500);
//第一行字段名称 //第一行字段名称
tops.forEach(column -> { tops.forEach(column -> {
XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0)); XSSFCell cell = row.createCell(Math.max(row.getLastCellNum(), 0));
......
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