Skip to content

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

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

parent 7dabd3ce
Showing with 121 additions and 22 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
...@@ -21,13 +21,13 @@ public class SendSmsAndMail { ...@@ -21,13 +21,13 @@ public class SendSmsAndMail {
log.info("返回："+sendSms("11111111111","111111","7")); log.info("返回："+sendSms("11111111111","111111","7"));
} }
log.info("发送完成"); log.info("发送完成");
// String res = BaiduDwz.createShortUrl("http://yrym.winsun-aly.com/gdtel-xyzx-hhr/customer/plan.do?orderId=d70f3423a6f"); // String res = BaiduDwz.createShortUrl("http://yrym.winsun-aly.com/gdtel-xyzx-hhr/customer/plan.do?orderId=d70f3423a6f");
// 生成url // 生成url
// log.info(res); // log.info(res);
} }
/** /**
* @param contactPhone * @param contactPhone
* 接收短信的手机号 * 接收短信的手机号
...@@ -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());
} }
......
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