Skip to content

G
gdtel-gztel-school-center
Commit acb4da97 by 伍思炜
Options

优化下单反馈

parent 3555d727
Showing with 154 additions and 10 deletions
apply-net/src/main/java/com/winsun/controller/codeManagerController.java
...@@ -412,6 +412,7 @@ public class codeManagerController { ...@@ -412,6 +412,7 @@ public class codeManagerController {
orderWrapper.eq(StringUtils.isNotBlank(idCard), "id_card", idCard); orderWrapper.eq(StringUtils.isNotBlank(idCard), "id_card", idCard);
orderWrapper.in("user_type","3,5,9,10"); orderWrapper.in("user_type","3,5,9,10");
orderWrapper.ne("order_status","异常单"); orderWrapper.ne("order_status","异常单");
orderWrapper.ne("order_status","已完成");
List<Order> order = orderMapper.selectList(orderWrapper); List<Order> order = orderMapper.selectList(orderWrapper);
if(order.size()>0){ if(order.size()>0){
Wrapper<OrderView> wrapper = new EntityWrapper<>(); Wrapper<OrderView> wrapper = new EntityWrapper<>();
......
common/src/main/java/com/winsun/mapper/OrderMapper.java
...@@ -237,4 +237,24 @@ public interface OrderMapper extends BaseMapper<Order> { ...@@ -237,4 +237,24 @@ public interface OrderMapper extends BaseMapper<Order> {
Map<String, Object> selectForId(@Param("id") String id); Map<String, Object> selectForId(@Param("id") String id);
/**
* 根据订单编号查询订单
*
* @param orderSeq
* @return
*/
Map<String, Object> selectByOrderSeq(String orderSeq);
/**
* 根据订单编号删除订单
*
* @param orderSeq
*/
void deleteByKdOrderId(String orderSeq);
List<Order> selectOrders();
List<Order> selectdclkd();
} }
common/src/main/java/com/winsun/mapper/OrderViewMapper.java
...@@ -46,4 +46,12 @@ public interface OrderViewMapper extends BaseMapper<OrderView> { ...@@ -46,4 +46,12 @@ public interface OrderViewMapper extends BaseMapper<OrderView> {
@Select("select order_university_name from order_view where orderSeq = #{kdOrderId}") @Select("select order_university_name from order_view where orderSeq = #{kdOrderId}")
String selectByKdOrderId (@Param("kdOrderId") String kdOrderId); String selectByKdOrderId (@Param("kdOrderId") String kdOrderId);
/**
* 根据订单编号删除订单
*
* @param orderSeq
*/
@Delete("delete from order_view where orderSeq = #{orderSeq}")
void deleteOrderSeq(@Param("orderSeq") String orderSeq);
} }
common/src/main/resources/com/winsun/mapper/mapping/OrderMapper.xml
...@@ -79,6 +79,11 @@ ...@@ -79,6 +79,11 @@
<result column="order_rf2" property="orderRf2"></result> <result column="order_rf2" property="orderRf2"></result>
<result column="orderSeqTHD" property="orderseqThd"/> <result column="orderSeqTHD" property="orderseqThd"/>
</resultMap> </resultMap>
<delete id="deleteByKdOrderId">
delete
from hhr_order
where kd_order_id = #{orderSeq}
</delete>
<select id="selectBroadBandOrderList" resultMap="broadBandOrder"> <select id="selectBroadBandOrderList" resultMap="broadBandOrder">
...@@ -595,15 +600,38 @@ ...@@ -595,15 +600,38 @@
order by create_time desc order by create_time desc
</select> </select>
<select id="selectRHList" resultType="java.util.Map"> <select id="selectRHList" resultType="java.util.Map">
SELECT * FROM hhr_order SELECT *
WHERE order_status = '未下单' and (user_type = 3 or user_type = 10) and rh_time &gt;= #{left} and rh_time &lt;= #{right} FROM hhr_order
WHERE order_status = '未下单'
and (user_type = 3 or user_type = 10)
and rh_time &gt;= #{left}
and rh_time &lt;= #{right}
</select> </select>
<select id="selectNotRHList" resultType="java.util.Map"> <select id="selectNotRHList" resultType="java.util.Map">
SELECT * FROM hhr_order SELECT *
WHERE order_status = '未下单' and rh_time is null and (user_type = 3 or user_type = 10) FROM hhr_order
WHERE order_status = '未下单'
and rh_time is null
and (user_type = 3 or user_type = 10)
</select> </select>
<select id="selectForId" resultType="java.util.Map"> <select id="selectForId" resultType="java.util.Map">
select * from hhr_order where id = #{id} select *
from hhr_order
where id = #{id}
</select>
<select id="selectByOrderSeq" resultType="java.util.Map">
select *
from hhr_order
where kd_order_id = #{orderSeq}
</select>
<select id="selectOrders" resultType="com.winsun.bean.Order">
select *
from hhr_order
where (order_status = '审核中' and kd_order_id is not null)
or (order_status = '待配送' and order_id is not null)
</select>
<select id="selectdclkd" resultType="com.winsun.bean.Order">
select * from hhr_order where order_status = '异常单' and th_status = '待下单人修改'
</select> </select>
......
task/src/main/java/com/winsun/TimingTask/OrderTask.java
...@@ -203,7 +203,7 @@ public class OrderTask { ...@@ -203,7 +203,7 @@ public class OrderTask {
wrapper.isNotNull("kd_order_id"); wrapper.isNotNull("kd_order_id");
wrapper.or(); wrapper.or();
wrapper.eq("order_status", "待配送"); wrapper.eq("order_status", "待配送");
wrapper.isNotNull("kd_order_id"); wrapper.isNotNull("order_id");
List<Order> orders = orderMapper.selectList(wrapper); List<Order> orders = orderMapper.selectList(wrapper);
...@@ -248,14 +248,23 @@ public class OrderTask { ...@@ -248,14 +248,23 @@ public class OrderTask {
SendSmsAndMail.sendSms(order.getContactNumber(), SendSmsAndMail.sendSms(order.getContactNumber(),
order.getNetNumber(), order.getNetNumber(),
order.getNetPassword(), "12"); order.getNetPassword(), "12");
} else if ("作废".equals(orderStatus.get("订单状态名称").toString()) || "下单异常".equals(orderStatus.get("订单状态名称").toString()) } else if ("作废".equals(orderStatus.get("订单状态名称").toString()) || "下单异常".equals(orderStatus.get("订单状态名称").toString())) {
|| "待下单人修改".equals(orderStatus.get("订单状态名称").toString())) {
orderHistory.setStatus("订单异常请联系管理员"); orderHistory.setStatus("订单异常请联系管理员");
orderHistoryMapper.insert(orderHistory); orderHistoryMapper.insert(orderHistory);
update.setThStatus(orderStatus.get("订单状态名称").toString()); update.setThStatus(orderStatus.get("订单状态名称").toString());
update.setOrderStatus("异常单"); update.setOrderStatus("异常单");
update.setMsg(orderStatus.get("订单状态名称").toString()); update.setMsg(orderStatus.get("订单状态名称").toString());
orderMapper.updateById(update); orderMapper.updateById(update);
}else if ("待下单人修改".equals(orderStatus.get("订单状态名称").toString())){
update.setMsg(orderStatus.get("订单状态名称").toString());
update.setThStatus(orderStatus.get("订单状态名称").toString());
update.setOrderStatus("异常单");
if (orderStatus.get("订单当前状态|状态备注").toString().contains("停机")||orderStatus.get("订单当前状态|状态备注").toString().contains("欠费")){
update.setMsg("停机/名下欠费");
}else if (orderStatus.get("订单当前状态|状态备注").toString().contains("黑名单")){
update.setMsg("身份证黑名单");
}
orderMapper.updateById(update);
} }
} }
} }
...@@ -263,16 +272,94 @@ public class OrderTask { ...@@ -263,16 +272,94 @@ public class OrderTask {
log.info("更新宽带和预制卡状态结束"); log.info("更新宽带和预制卡状态结束");
} }
/**
* 定时器更新智能平台状态
*/
@Scheduled(cron = "0 0/10 * * * ?")
public void updateStatus3() throws Exception {
log.info("开始更新宽带状态为异常单但中台状态为带下单人修改的订单");
// 获取审核中的订单
Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("order_status", "异常单");
wrapper.isNotNull("kd_order_id");
wrapper.eq("th_status","待下单人修改");
List<Order> orders = orderMapper.selectList(wrapper);
// 循环请求获取数据
for (Order order : orders) {
Date createTime = order.getCreateTime();
int i = Integer.parseInt(String.valueOf((new Date().getTime() - createTime.getTime()) / (1000 * 60 * 60 * 24)));
if (StringUtils.isNotBlank(order.getOrderId()) && i <= 7) {
String boday = intelligenceSendOrders.queryStatus(order.getOrderId());
if (StringUtils.isNotBlank(boday)) {
Order update = new Order();
update.setId(order.getId());
update.setUpdateTime(new Date());
OrderHistory orderHistory = new OrderHistory();
orderHistory.setOrderId(order.getId());
orderHistory.setCreateDate(new Date());
orderHistory.setStatus("智能平台状态获取");
JSONObject json = JSONObject.parseObject(boday);
Map<String, Object> map = JSONObject.parseObject(json.getString("data"));
List<Object> list = (List<Object>) map.get("q");
Map<String, Object> map2 = (Map<String, Object>) list.get(0);
Map<String, Object> orderStatus = (Map<String, Object>) map2.get("订单当前状态");
// 未获取到需要的状态不做更新
if ("归档".equals(orderStatus.get("订单状态名称").toString()) || "受理成功待竣工".equals(orderStatus.get("订单状态名称").toString())) {
orderHistory.setStatus("订单已完成");
orderHistoryMapper.insert(orderHistory);
update.setThStatus(orderStatus.get("订单状态名称").toString());
update.setOrderStatus("已完成");
orderMapper.updateById(update);
//查询该订单的学校名称
String schoolName = orderViewMapper.selectByKdOrderId(order.getKdOrderId());
if (schoolSet.contains(schoolName)) {
order.setNetNumber(order.getNetNumber().split("@")[0]);
}
// 下发短信
SendSmsAndMail.sendSms(order.getContactNumber(),
order.getNetNumber(),
order.getNetPassword(), "12");
} else if ("作废".equals(orderStatus.get("订单状态名称").toString()) || "下单异常".equals(orderStatus.get("订单状态名称").toString())) {
orderHistory.setStatus("订单异常请联系管理员");
orderHistoryMapper.insert(orderHistory);
update.setThStatus(orderStatus.get("订单状态名称").toString());
update.setOrderStatus("异常单");
update.setMsg(orderStatus.get("订单状态名称").toString());
orderMapper.updateById(update);
}else if (!"待下单人修改".equals(orderStatus.get("订单状态名称").toString())){
update.setMsg(null);
update.setThStatus(orderStatus.get("订单状态名称").toString());
update.setOrderStatus("审核中");
orderMapper.updateById(update);
}
}
}
}
log.info("结束更新宽带状态为待处理且中台状态为带下单人修改的订单");
}
//@Scheduled(cron = "0 0/5 * * * ?") //@Scheduled(cron = "0 0/5 * * * ?")
public void updateStatus2() throws Exception { public void updateStatus2() throws Exception {
// 获取审核中的订单 // 获取审核中的订单
Wrapper<Order> wrapper = new EntityWrapper<>(); Wrapper<Order> wrapper = new EntityWrapper<>();
wrapper.eq("order_status", "审核中"); wrapper.eq("order_status", "审核中");
wrapper.isNotNull("kd_order_id"); wrapper.isNotNull("order_id");
wrapper.or(); wrapper.or();
wrapper.eq("order_status", "待配送"); wrapper.eq("order_status", "待配送");
wrapper.isNotNull("kd_order_id"); wrapper.isNotNull("order_id");
List<Order> orders = orderMapper.selectList(wrapper); List<Order> orders = orderMapper.selectList(wrapper);
......
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