Skip to content

G
gdtel-gztel-school-center
Commit 6ba1141e by 弓厶
Options

Merge remote-tracking branch 'origin/master'

parents 23c33009 9ccb04e8
Showing with 36 additions and 7 deletions
common/src/main/java/com/winsun/mapper/OrderMapper.java
...@@ -26,26 +26,33 @@ public interface OrderMapper extends BaseMapper<Order> { ...@@ -26,26 +26,33 @@ public interface OrderMapper extends BaseMapper<Order> {
@Select("select * from `hhr_order_history` where order_id = #{oredrId}") @Select("select * from `hhr_order_history` where order_id = #{oredrId}")
List<Map<String,Object>> selectOrderHis(String oredrId); List<Map<String,Object>> selectOrderHis(String oredrId);
@Update("update `hhr_order` set order_status = #{orderStatus}, accept_name = #{acceptName}," + @Update("update `hhr_order` set order_status = #{orderStatus}, accept_name = #{acceptName},success_time=#{successTime}," +
" accept_result = #{acceptResult}, accept_comment = #{acceptComment}, accept_date = #{acceptDate} " + " accept_result = #{acceptResult}, accept_comment = #{acceptComment}, accept_date = #{acceptDate} " +
" where order_number = #{orderNumber}") " where order_number = #{orderNumber}")
Integer updateOrderSUByOrderNumberIsNotNull(@Param("orderNumber") String orderNumber,@Param("orderStatus") String orderStatus, Integer updateOrderSUByOrderNumberIsNotNull(@Param("orderNumber") String orderNumber,@Param("orderStatus") String orderStatus,
@Param("acceptName") String acceptName,@Param("acceptResult") String acceptResult, @Param("acceptName") String acceptName,@Param("acceptResult") String acceptResult,
@Param("acceptComment") String acceptComment,@Param("acceptDate") Date acceptDate); @Param("acceptComment") String acceptComment,@Param("acceptDate") Date acceptDate,@Param("successTime")Date successTime);
@Update("update `hhr_order` set order_status = #{orderStatus}, accept_name = #{acceptName}," + @Update("update `hhr_order` set order_status = #{orderStatus}, accept_name = #{acceptName}," +
" accept_result = #{acceptResult}, accept_date = #{acceptDate} " + " accept_result = #{acceptResult}, accept_date = #{acceptDate},success_time=#{successTime} " +
" where order_number = #{orderNumber}") " where order_number = #{orderNumber}")
Integer updateOrderSUByOrderNumberIsNull(@Param("orderNumber") String orderNumber,@Param("orderStatus") String orderStatus, Integer updateOrderSUByOrderNumberIsNull(@Param("orderNumber") String orderNumber,@Param("orderStatus") String orderStatus,
@Param("acceptName") String acceptName,@Param("acceptResult") String acceptResult, @Param("acceptName") String acceptName,@Param("acceptResult") String acceptResult,
@Param("acceptDate") Date acceptDate); @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} where order_number = #{orderNumber}")
Integer updateOrderKDIsNotNull(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus); Integer updateOrderKDIsNotNull(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus);
@Update("update `hhr_order` set order_status = #{orderStatus},company = #{company},kuaidi_order = #{kuaidiOrder},send_type = #{sendType},success_time=#{successTime} where order_number = #{orderNumber}")
Integer updateOrderKDIsNotNull(@Param("orderNumber") String orderNumber,@Param("company") String company,@Param("kuaidiOrder") String kuaidiOrder,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus,@Param("successTime")Date successTime);
@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}")
Integer updateOrderKDIsNull(@Param("orderNumber") String orderNumber,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus); Integer updateOrderKDIsNull(@Param("orderNumber") String orderNumber,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus);
@Update("update `hhr_order` set order_status = #{orderStatus},send_type = #{sendType},success_time=#{successTime} where order_number = #{orderNumber}")
Integer updateOrderKDIsNull(@Param("orderNumber") String orderNumber,@Param("sendType") String sendType,@Param("orderStatus") String orderStatus,@Param("successTime")Date successTime);
@Select("select id from `hhr_order` where order_number = #{orderNumber}") @Select("select id from `hhr_order` where order_number = #{orderNumber}")
String selectIdByOrderNumber(String orderNumber); String selectIdByOrderNumber(String orderNumber);
......
old-user/src/main/java/com/winsun/controller/ChooseController.java
...@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMethod; ...@@ -21,6 +21,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -142,6 +143,7 @@ public class ChooseController { ...@@ -142,6 +143,7 @@ public class ChooseController {
} }
if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){ if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){
dataMapping.put("order_status", "异常单"); dataMapping.put("order_status", "异常单");
dataMapping.put("success_time", new Date());
} }
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1); orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
log.info(order.getXbOrderId()+"订单已更新"); log.info(order.getXbOrderId()+"订单已更新");
......
old-user/src/main/java/com/winsun/controller/PackageUpgradeController.java
...@@ -355,6 +355,8 @@ public class PackageUpgradeController extends BaseController { ...@@ -355,6 +355,8 @@ public class PackageUpgradeController extends BaseController {
order.setAddress(addRess); order.setAddress(addRess);
order.setBusinessPackage("天翼羊城通手机卡业务"); order.setBusinessPackage("天翼羊城通手机卡业务");
order.setUserSchool(userSchool); order.setUserSchool(userSchool);
order.setOrderStatus(OrderStatus.ACCEPTANCESUCCESSFUL.getName());
order.setSuccessTime(new Date());
insert += orderMapper.insert(order); insert += orderMapper.insert(order);
YangChengTong yangChengTong = new YangChengTong(); YangChengTong yangChengTong = new YangChengTong();
yangChengTong.setSchool(schoolName); yangChengTong.setSchool(schoolName);
......
service-manager/src/main/java/com/winsun/controller/OrderController.java
...@@ -115,7 +115,6 @@ public class OrderController extends BaseController { ...@@ -115,7 +115,6 @@ public class OrderController extends BaseController {
wrapper.eq("id", id); wrapper.eq("id", id);
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("student_card_check_status", studentCardCheckStatus); dataMapping.put("student_card_check_status", studentCardCheckStatus);
dataMapping.put("order_status", "已完成");
if (StringUtils.isNotBlank(checkFail)) { if (StringUtils.isNotBlank(checkFail)) {
dataMapping.put("check_fail", checkFail); dataMapping.put("check_fail", checkFail);
} }
...@@ -146,6 +145,7 @@ public class OrderController extends BaseController { ...@@ -146,6 +145,7 @@ public class OrderController extends BaseController {
wrapper.eq("id", orderId); wrapper.eq("id", orderId);
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("order_status", "异常单"); dataMapping.put("order_status", "异常单");
dataMapping.put("success_time", new Date());
Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
if (integer == 1) { if (integer == 1) {
appMapper.inserOrderHis(orderId, "异常单!", new Date(), user.getName()); appMapper.inserOrderHis(orderId, "异常单!", new Date(), user.getName());
...@@ -503,6 +503,7 @@ public class OrderController extends BaseController { ...@@ -503,6 +503,7 @@ public class OrderController extends BaseController {
} }
int number = 0; int number = 0;
Date acceptDate = new Date(); Date acceptDate = new Date();
Date successTime = acceptDate;
for (int i = 1; i < listMap.size(); i++) { for (int i = 1; i < listMap.size(); i++) {
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();
...@@ -523,9 +524,9 @@ public class OrderController extends BaseController { ...@@ -523,9 +524,9 @@ public class OrderController extends BaseController {
} }
Integer integer = null; Integer integer = null;
if (StringUtils.isNotBlank(acceptComment)) { if (StringUtils.isNotBlank(acceptComment)) {
integer = orderMapper.updateOrderSUByOrderNumberIsNotNull(orderNumber, orderStatus, acceptName, acceptResult, acceptComment, acceptDate); integer = orderMapper.updateOrderSUByOrderNumberIsNotNull(orderNumber, orderStatus, acceptName, acceptResult, acceptComment, acceptDate,successTime);
} else { } else {
integer = orderMapper.updateOrderSUByOrderNumberIsNull(orderNumber, orderStatus, acceptName, acceptResult, acceptDate); integer = orderMapper.updateOrderSUByOrderNumberIsNull(orderNumber, orderStatus, acceptName, acceptResult, acceptDate,successTime);
} }
if (integer == 1) { if (integer == 1) {
...@@ -632,6 +633,7 @@ public class OrderController extends BaseController { ...@@ -632,6 +633,7 @@ public class OrderController extends BaseController {
return ResponseData.error("导入异常！"); return ResponseData.error("导入异常！");
} }
int number = 0; int number = 0;
Date successTime = new Date();
for (int i = 1; i < listMap.size(); i++) { for (int i = 1; i < listMap.size(); i++) {
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();
...@@ -642,6 +644,7 @@ public class OrderController extends BaseController { ...@@ -642,6 +644,7 @@ public class OrderController extends BaseController {
String xbOrderId = orderMapper.selectxbOrderIdByOrderNumber(orderNumber); String xbOrderId = orderMapper.selectxbOrderIdByOrderNumber(orderNumber);
if (StringUtils.isNotBlank(xbOrderId)) { if (StringUtils.isNotBlank(xbOrderId)) {
orderStatus = "待活体"; orderStatus = "待活体";
successTime = null;
} else { } else {
orderStatus = "已完成"; orderStatus = "已完成";
} }
...@@ -651,9 +654,18 @@ public class OrderController extends BaseController { ...@@ -651,9 +654,18 @@ public class OrderController extends BaseController {
} }
Integer integer = null; Integer integer = null;
if (StringUtils.isBlank(company) || StringUtils.isBlank(kuaidiOrder)) { if (StringUtils.isBlank(company) || StringUtils.isBlank(kuaidiOrder)) {
if(successTime == null){
integer = orderMapper.updateOrderKDIsNull(orderNumber, sendType, orderStatus); integer = orderMapper.updateOrderKDIsNull(orderNumber, sendType, orderStatus);
}else {
integer = orderMapper.updateOrderKDIsNull(orderNumber, sendType, orderStatus,successTime);
}
} else { } else {
if(successTime == null){
integer = orderMapper.updateOrderKDIsNotNull(orderNumber, company, kuaidiOrder, sendType, orderStatus); integer = orderMapper.updateOrderKDIsNotNull(orderNumber, company, kuaidiOrder, sendType, orderStatus);
}else {
integer = orderMapper.updateOrderKDIsNotNull(orderNumber, company, kuaidiOrder, sendType, orderStatus,successTime);
}
} }
if (integer == 1) { if (integer == 1) {
number++; number++;
......
service-manager/src/main/java/com/winsun/controller/supervisorController.java
...@@ -122,6 +122,7 @@ public class supervisorController extends BaseController { ...@@ -122,6 +122,7 @@ public class supervisorController extends BaseController {
wrapper.eq("id", orderId); wrapper.eq("id", orderId);
Map<String, Object> dataMapping = new HashMap<>(); Map<String, Object> dataMapping = new HashMap<>();
dataMapping.put("order_status", "异常单"); dataMapping.put("order_status", "异常单");
dataMapping.put("success_time", new Date());
Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
if (integer == 0) { if (integer == 0) {
return ResponseData.error("置为异常单失败！"); return ResponseData.error("置为异常单失败！");
...@@ -228,6 +229,7 @@ public class supervisorController extends BaseController { ...@@ -228,6 +229,7 @@ public class supervisorController extends BaseController {
dataMapping.put("business_iccid", iccid); dataMapping.put("business_iccid", iccid);
} else { } else {
dataMapping.put("order_status", "已完成"); dataMapping.put("order_status", "已完成");
dataMapping.put("success_time", new Date());
} }
dataMapping.put("business_number", businessNumber); dataMapping.put("business_number", businessNumber);
Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper); Integer integer = orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper);
...@@ -275,6 +277,7 @@ public class supervisorController extends BaseController { ...@@ -275,6 +277,7 @@ public class supervisorController extends BaseController {
dataMapping.put("order_status", "待活体"); dataMapping.put("order_status", "待活体");
} else { } else {
dataMapping.put("order_status", "已完成"); dataMapping.put("order_status", "已完成");
dataMapping.put("success_time", new Date());
} }
dataMapping.put("company", expressDelivery); dataMapping.put("company", expressDelivery);
dataMapping.put("kuaidi_order", kuaidiOrder); dataMapping.put("kuaidi_order", kuaidiOrder);
......
task/src/main/java/com/winsun/TimingTask/OrderTask.java
...@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping; ...@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import java.text.ParseException; import java.text.ParseException;
import java.util.Date;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
...@@ -59,6 +60,7 @@ public class OrderTask { ...@@ -59,6 +60,7 @@ public class OrderTask {
} }
if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){ if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){
dataMapping.put("order_status", "异常单"); dataMapping.put("order_status", "异常单");
dataMapping.put("success_time", new Date());
} }
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1); orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
log.info(order.getXbOrderId()+"订单已更新"); log.info(order.getXbOrderId()+"订单已更新");
...@@ -85,6 +87,7 @@ public class OrderTask { ...@@ -85,6 +87,7 @@ public class OrderTask {
if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){ if(Map.get("orderState").toString().equals("10") || Map.get("orderState").toString().equals("11")){
dataMapping.put("order_status", "异常单"); dataMapping.put("order_status", "异常单");
} }
dataMapping.put("success_time", new Date());
orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1); orderMapper.updateForSet(MyBatisPlusUpdateUtils.toUpdateSet(dataMapping), wrapper1);
log.info(order.getXbOrderId()+"订单已更新"); log.info(order.getXbOrderId()+"订单已更新");
} catch (Exception e) { } catch (Exception e) {
......
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