广美和星海宽带短信内容修改

common/src/main/java/com/winsun/mapper/OrderViewMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.baomidou.mybatisplus.mapper.Wrapper;
 import com.winsun.bean.OrderView;
 import org.apache.ibatis.annotations.*;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
 
 import java.sql.Timestamp;
@@ -42,4 +43,7 @@ public interface OrderViewMapper extends BaseMapper<OrderView> {
 
     @Select("select * from order_view where orderNumber=#{orderNumber} and status !=#{status} ")
     List<Map<String,Object>> orderViewToStatusList(@Param("orderNumber")String orderNumber,@Param("status")String status);
+
+    @Select("select order_university_name from order_view where orderSeq = #{kdOrderId}")
+    String selectByKdOrderId (@Param("kdOrderId") String kdOrderId);
 }

task/src/main/java/com/winsun/TimingTask/OrderTask.java

@@ -23,10 +23,7 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.text.ParseException;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 @Slf4j
 @RestController
@@ -48,6 +45,9 @@ public class OrderTask {
     private SalesListMapper salesListMapper;
 
     @Autowired
+    private OrderViewMapper orderViewMapper;
+
+    @Autowired
     private AppMapper appMapper;
 
     @Autowired
@@ -137,6 +137,7 @@ public class OrderTask {
         wrapper.isNotNull("kd_order_id");
         List<Order> orders = orderMapper.selectList(wrapper);
 
+
         // 循环请求获取数据
         for(Order order : orders) {
             if (StringUtils.isNotBlank(order.getKdOrderId())) {
@@ -162,6 +163,14 @@ public class OrderTask {
                         update.setOrderStatus("已完成");
                         orderMapper.updateById(update);
 
+                        //查询该订单的学校名称
+                        String schoolName = orderViewMapper.selectByKdOrderId(order.getKdOrderId());
+
+                        if ("星海音乐学院".equals(schoolName) || "广州美术学院".equals(schoolName)){
+                            order.setNetNumber(order.getNetNumber().split("@")[0]);
+                        }
+
+
                         // 下发短信
                         SendSmsAndMail.sendSms2(order.getContactNumber(),
                                 order.getNetNumber(),