fix：“修复支付回调部分报错问题“

src/main/java/com/szwl/controller/TOrderController.java

@@ -3385,7 +3385,10 @@ public class TOrderController {
         order = orderService.getById(order.getId());
         int i = 0;
         TAdmin admin = R.getDataIfSuccess(szwlFeign.getAdmin(String.valueOf(order.getAdminId())));
-        if(admin.getId().toString().equals("372")||admin.getRelationAdminId().equals("372")||admin.getId().toString().equals("639")||admin.getId().toString().equals("238")){
+        String adminId = admin.getId().toString();
+        String relationAdminId = admin.getRelationAdminId();
+        if((StringUtils.isNotEmpty(adminId) && (adminId.equals("372") ||adminId.equals("639")||adminId.equals("238")))
+                || (StringUtils.isNotEmpty(relationAdminId) && relationAdminId.equals("372"))){
             //发送数据到鲸准
             String url = "http://47.106.13.109:3000/api/listen";
             Map<String,String> map = new HashMap<>();
@@ -3990,6 +3993,17 @@ public class TOrderController {
     @RequestMapping(value = "/getOrderStatus", method = RequestMethod.GET)
     @ResponseBody
     public JsonMessage getOrderStatus(String sn) {
+        if (sn.contains("-")) {
+            String[] sns = sn.split("-");
+            for (int i = 0; i < sns.length; i++) {
+                LambdaQueryWrapper<TOrder> query1 = Wrappers.lambdaQuery();
+                query1.eq(TOrder::getSn, sns[i]);
+                TOrder order = orderService.getOne(query1);
+                if (order.getStatus() == 1) {
+                    return JsonMessage.success("pay");
+                }
+            }
+        }
         LambdaQueryWrapper<TOrder> query = Wrappers.lambdaQuery();
         query.eq(TOrder::getSn,sn);
         List<TOrder> list = orderService.list(query);