中台下单参数调整

common/src/main/java/com/winsun/bean/EasyPay.java

+package com.winsun.bean;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class EasyPay implements Serializable {
+
+    private String 穗易付订单号;
+    private String 穗易付支付流水号;
+    private String 穗易付支付平台;
+    private String 穗易付支付金额;
+
+}

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

@@ -3,10 +3,15 @@ package com.winsun.mapper;
 import com.baomidou.mybatisplus.mapper.BaseMapper;
 import com.winsun.bean.KdyList;
 import com.winsun.bean.RhPhone;
+import org.apache.ibatis.annotations.Delete;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.DeleteMapping;
 
 @Mapper
 @Component
 public interface RhPhoneMapper extends BaseMapper<RhPhone> {
+    @Delete("delete from hhr_kd_phone where phone = #{phone}")
+    void deletePhone(@Param("phone") String phone);
 }

service-manager/src/main/java/com/winsun/controller/OrderController.java

@@ -1793,9 +1793,9 @@ public class OrderController extends BaseController {
                                 map1.put("cardType", orderData.getKapin());
 
                                 if ("49".equals(orderData.getPackageId())) {
-                                    //map1.put("userName", orderData.getParentName());
+                                    map1.put("userName", orderData.getParentName());
                                     map1.put("idCardUrl4", orderData.getIdCardzs().replace("manager", "app"));
-                                    map1.put("idCardUrl4", orderData.getIdCardzs());
+                                    //map1.put("idCardUrl4", orderData.getIdCardzs());
                                 } else {
                                     map1.put("userName", orderData.getCustomerName());
                                     map1.put("idCardUrl4", orderData.getStudenCard().replace("manager", "app"));

service-manager/src/main/java/com/winsun/controller/RhPhoneController.java

@@ -136,9 +136,13 @@ public class RhPhoneController extends BaseController {
                 RhPhone rhPhone=new RhPhone();
                 Map<String, Object> map = listMap.get(i);
                 rhPhone.setPhone(map.get("a").toString());
-                Wrapper<RhPhone> wrapper = new EntityWrapper<>();
-                wrapper.eq("phone",rhPhone);
-                rhPhoneMapper.delete(wrapper);
+                rhPhoneMapper.deletePhone(map.get("a").toString());
+                //rhPhoneMapper.insert(rhPhone);
+            }
+            for (int i = 0; i < listMap.size(); i++) {
+                RhPhone rhPhone=new RhPhone();
+                Map<String, Object> map = listMap.get(i);
+                rhPhone.setPhone(map.get("a").toString());
                 rhPhoneMapper.insert(rhPhone);
             }
             return ResponseData.success(error.toString(), "导入完成");

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

@@ -117,20 +117,21 @@ public class OrderTask {
 
                     // 未获取到需要的状态不做更新
                     if ("物流待配送".equals(orderStatus.get("订单状态名称")) || "物流配送中".equals(orderStatus.get("订单状态名称"))
-                            || "配送成功【待收费】".equals(orderStatus.get("订单状态名称")) || "归档".equals(orderStatus.get("订单状态名称"))) {
+                            || "配送成功【待收费】".equals(orderStatus.get("订单状态名称")) || "归档".equals(orderStatus.get("订单状态名称"))
+                    || "待用户号卡实名中".equals(orderStatus.get("订单状态名称"))) {
                         orderHistory.setStatus("审核通过,等待配送");
                         orderHistoryMapper.insert(orderHistory);
 
                         update.setThStatus(orderStatus.get("订单状态名称").toString());
                         update.setOrderStatus("待配送");
-                        update.setMsg(json.get("stateName").toString());
+                        update.setMsg(orderStatus.get("订单状态名称").toString());
                         orderMapper.updateById(update);
 
                     } else if (orderStatus.get("订单状态名称").equals("待图片审核") || orderStatus.get("订单状态名称").equals("作废")) {
                         orderHistory.setStatus(orderStatus.get("订单状态名称") + ";" + orderStatus.get("stateName"));
                         orderHistoryMapper.insert(orderHistory);
-                        update.setThStatus(json.get("stateName").toString());
-                        update.setMsg(json.getString("stateName"));
+                        update.setThStatus(orderStatus.get("订单状态名称").toString());
+                        update.setMsg(orderStatus.get("订单状态名称").toString());
                         update.setOrderStatus("异常单");
                         orderMapper.updateById(update);
                     }
@@ -195,7 +196,7 @@ public class OrderTask {
      */
     @Scheduled(cron = "0 0/5 * * * ?")
     public void updateStatus() throws Exception {
-
+        log.info("更新宽带和预制卡状态开始");
         // 获取审核中的订单
         Wrapper<Order> wrapper = new EntityWrapper<>();
         wrapper.eq("order_status", "审核中");
@@ -220,6 +221,7 @@ public class OrderTask {
                     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");
@@ -227,7 +229,7 @@ public class OrderTask {
                     Map<String, Object> orderStatus = (Map<String, Object>) map2.get("订单当前状态");
 
                     // 未获取到需要的状态不做更新
-                    if ("归档".equals(orderStatus.get("订单状态名称")) || "受理完成待竣工".equals(json.getString("orderStatus"))) {
+                    if ("归档".equals(orderStatus.get("订单状态名称").toString()) || "受理成功待竣工".equals(orderStatus.get("订单状态名称").toString())) {
                         orderHistory.setStatus("订单已完成");
                         orderHistoryMapper.insert(orderHistory);
 
@@ -246,21 +248,22 @@ public class OrderTask {
                         SendSmsAndMail.sendSms(order.getContactNumber(),
                                 order.getNetNumber(),
                                 order.getNetPassword(), "12");
-                    } else if ("作废".equals(orderStatus.get("订单状态名称")) || "下单异常".equals(orderStatus.get("订单状态名称"))) {
+                    } else if ("作废".equals(orderStatus.get("订单状态名称").toString()) || "下单异常".equals(orderStatus.get("订单状态名称").toString())
+                            || "待下单人修改".equals(orderStatus.get("订单状态名称").toString())) {
                         orderHistory.setStatus("订单异常请联系管理员");
                         orderHistoryMapper.insert(orderHistory);
-
-                        update.setThStatus(json.get("orderStatus").toString());
+                        update.setThStatus(orderStatus.get("订单状态名称").toString());
                         update.setOrderStatus("异常单");
-                        update.setMsg(json.get("stateName").toString());
+                        update.setMsg(orderStatus.get("订单状态名称").toString());
                         orderMapper.updateById(update);
                     }
                 }
             }
         }
+        log.info("更新宽带和预制卡状态结束");
     }
 
-    @Scheduled(cron = "0 0/5 * * * ?")
+    //@Scheduled(cron = "0 0/5 * * * ?")
     public void updateStatus2() throws Exception {
 
         // 获取审核中的订单

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

@@ -108,6 +108,7 @@ public class RhZhiNenTask {
             Map<String, Object> map = new HashMap<>();
             // 发送下单请求
             for(int i = 0; i < orders.size(); ++i) {
+                System.out.println(orders.get(i).get("id"));
                 intelligenceSendOrders.integrateSendOrder(orders.get(i), false);
             }