广电报备新增订单列表等接口

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/admin/SysGdController.java

@@ -6,10 +6,13 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.kxs.common.core.util.R;
 import com.kxs.common.idempotent.annotation.Idempotent;
 import com.kxs.common.security.annotation.Inner;
+import com.kxs.product.api.model.KxsGdOrder;
 import com.kxs.product.api.model.KxsGdReport;
 import com.kxs.product.biz.constant.enums.GdReportEnum;
+import com.kxs.product.biz.service.KxsGdOrderService;
 import com.kxs.product.biz.service.KxsGdReportService;
 import lombok.RequiredArgsConstructor;
+import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
@@ -30,6 +33,7 @@ public class SysGdController {
      * 服务对象
      */
     private final KxsGdReportService kxsGdReportService;
+    private final KxsGdOrderService kxsGdOrderService;
 
 
 
@@ -82,15 +86,37 @@ public class SysGdController {
         return kxsGdReportService.checkGdData(startTime, endTime);
     }
 
+    /**
+     * 广电报备-查询电渠订单列表
+     *
+     */
+    @GetMapping("/gdOrderPage")
+//    @PreAuthorize("@pms.hasPermission('sys_gd_order_list')")
+    public R gdOrderPage(Page<KxsGdOrder> page, @ParameterObject KxsGdOrder param) {
+
+        return R.ok(kxsGdOrderService.getByPage(page, param));
+    }
+
+    /**
+     * 广电报备-人工推送激活
+     *
+     */
+    @GetMapping("/toAct")
+//    @PreAuthorize("@pms.hasPermission('sys_gd_to_act')")
+    public R toAct(@RequestParam("id") Integer id) {
+
+        return R.ok(kxsGdOrderService.toAct(id));
+    }
+
     /**
      * 广电报备-查询电渠订单接口
      *
      */
     @PostMapping("/onlineSimOrder")
+//    @PreAuthorize("@pms.hasPermission('sys_gd_online_sim_order')")
     public R onlineSimOrder(@RequestBody List<String> orderNos) {
 
-        kxsGdReportService.onlineSimOrder(orderNos);
-        return R.ok();
+        return R.ok(kxsGdOrderService.onlineSimOrder(orderNos));
     }
 
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/controller/kxsapp/GdController.java

@@ -12,6 +12,7 @@ import com.kxs.product.api.dto.kxsapp.gd.GdReportPutDTO;
 import com.kxs.product.api.model.KxsGdReport;
 import com.kxs.product.api.vo.kxsapp.gd.GdReportListVO;
 import com.kxs.product.api.vo.kxsapp.machine.MachineUnBindListVO;
+import com.kxs.product.biz.service.KxsGdOrderService;
 import com.kxs.product.biz.service.KxsGdReportService;
 import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
@@ -34,6 +35,7 @@ public class GdController {
      * 服务对象
      */
     private final KxsGdReportService kxsGdReportService;
+    private final KxsGdOrderService kxsGdOrderService;
 
 
 
@@ -161,7 +163,7 @@ public class GdController {
     @PostMapping("/acceptActData")
     public Object acceptActData(@RequestBody Map<String, Object> param) {
 
-        kxsGdReportService.acceptActData(param);
+        kxsGdOrderService.acceptGdActData(param);
 
         JSONObject result = new JSONObject();
         result.put("resultCode", 1);

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsGdOrderService.java

@@ -1,7 +1,13 @@
 package com.kxs.product.biz.service;
 
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.kxs.product.api.model.KxsGdOrder;
+import com.kxs.product.api.model.KxsGdReport;
+
+import java.util.List;
+import java.util.Map;
 
 /**
  * 广电推送订单信息表(KxsGdOrder)表服务接口
@@ -11,5 +17,36 @@ import com.kxs.product.api.model.KxsGdOrder;
  */
 public interface KxsGdOrderService extends IService<KxsGdOrder> {
 
+    /**
+     * 分页查询
+     *
+     * @param page  页
+     * @param param 参数
+     * @return {@link IPage}<{@link KxsGdOrder}>
+     */
+    IPage<KxsGdOrder> getByPage(Page<KxsGdOrder> page, KxsGdOrder param);
+
+    /**
+     * 人工推送激活
+     *
+     * @param id id
+     * @return {@link Boolean}
+     */
+    Boolean toAct(Integer id);
+
+
+    /**
+     * 匹配 广电 开卡数据 接收推送
+     *
+     * @param param 订单数据
+     */
+    void acceptGdActData(Map<String, Object> param);
+
+    /**
+     * 广电报备-查询电渠订单接口
+     *
+     * @param orderNos 订单号
+     */
+    Boolean onlineSimOrder(List<String> orderNos);
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsGdReportService.java

@@ -115,18 +115,5 @@ public interface KxsGdReportService extends IService<KxsGdReport> {
      */
     GdDqDotNumVO dqDotNum();
 
-    /**
-     * 接受广电 激活 数据
-     *
-     * @param param 参数
-     */
-    void acceptActData(Map<String, Object> param);
-
-    /**
-     * 广电报备-查询电渠订单接口
-     *
-     * @param orderNos 订单号
-     */
-    void onlineSimOrder(List<String> orderNos);
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/KxsGdService.java

@@ -1,5 +1,9 @@
 package com.kxs.product.biz.service;
 
+import com.alibaba.fastjson.JSONArray;
+import com.kxs.product.api.model.KxsGdOrder;
+import com.kxs.product.api.res.gd.GdSimOrderRes;
+
 import java.util.List;
 import java.util.Map;
 
@@ -26,12 +30,20 @@ public interface KxsGdService {
      *
      * @param param 订单数据
      */
-    void acceptGdActData(Map<String, Object> param);
+    JSONArray acceptGdActData(Map<String, Object> param);
 
     /**
      * 查询电渠订单接口
      *
      * @param orderNos 订单号
      */
-    void onlineSimOrder(List<String> orderNos);
+    List<GdSimOrderRes> onlineSimOrder(List<String> orderNos);
+
+    /**
+     * 发送 MQ
+     *
+     * @param order 次序
+     * @param sn    锡
+     */
+    void toSendMq(KxsGdOrder order, String sn);
 }

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdOrderServiceImpl.java

@@ -1,10 +1,36 @@
 package com.kxs.product.biz.service.impl;
 
+import cn.hutool.core.date.DatePattern;
+import cn.hutool.core.date.LocalDateTimeUtil;
+import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONArray;
+import com.alibaba.fastjson.JSONObject;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.common.core.exception.GlobalCustomerException;
+import com.kxs.product.api.model.KxsGdReport;
+import com.kxs.product.api.res.gd.GdSimOrderRes;
+import com.kxs.product.biz.constant.enums.GdReportEnum;
+import com.kxs.product.biz.constant.enums.ProductErrorTypeEnum;
 import com.kxs.product.biz.mapper.KxsGdOrderMapper;
 import com.kxs.product.api.model.KxsGdOrder;
+import com.kxs.product.biz.mapper.KxsGdReportMapper;
 import com.kxs.product.biz.service.KxsGdOrderService;
+import com.kxs.product.biz.service.KxsGdService;
+import com.kxs.product.biz.util.GdRsaUtils;
+import com.kxs.system.api.model.SysLog;
+import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.math.BigDecimal;
+import java.util.List;
+import java.util.Map;
+import java.util.Optional;
 
 /**
  * 广电推送订单信息表(KxsGdOrder)表服务实现类
@@ -13,7 +39,146 @@ import org.springframework.stereotype.Service;
  * @since 2024-06-19 12:36:35
  */
 @Service("kxsGdOrderService")
+@RequiredArgsConstructor
 public class KxsGdOrderServiceImpl extends ServiceImpl<KxsGdOrderMapper, KxsGdOrder> implements KxsGdOrderService {
 
+    private final KxsGdService kxsGdService;
+
+    private final KxsGdReportMapper kxsGdReportMapper;
+
+    @Override
+    public IPage<KxsGdOrder> getByPage(Page<KxsGdOrder> page, KxsGdOrder param) {
+
+        LambdaQueryWrapper<KxsGdOrder> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(StrUtil.isNotBlank(param.getGdMobile()), KxsGdOrder::getGdMobile, param.getGdMobile());
+        wrapper.eq(StrUtil.isNotBlank(param.getOrderNo()), KxsGdOrder::getOrderNo, param.getOrderNo());
+
+        return baseMapper.selectPage(page, wrapper);
+    }
+
+    @Override
+    public Boolean toAct(Integer id) {
+
+        KxsGdOrder order = getById(id);
+        Optional.ofNullable(order).orElseThrow(() -> new GlobalCustomerException(ProductErrorTypeEnum.DATA_EMPTY.getDescription()));
+        KxsGdReport gdReport = kxsGdReportMapper.selectOne(Wrappers.<KxsGdReport>lambdaQuery()
+                .eq(KxsGdReport::getGdMobile, order.getGdMobile())
+                .eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())
+                .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_NO.getType()));
+        Optional.ofNullable(gdReport).orElseThrow(() -> new GlobalCustomerException("广电报备数据未找到"));
+
+        kxsGdService.toSendMq(order, gdReport.getGdSn());
+
+        return Boolean.TRUE;
+    }
+
+
+    @Override
+    public Boolean onlineSimOrder(List<String> orderNos) {
+
+        List<GdSimOrderRes> list = kxsGdService.onlineSimOrder(orderNos);
+        for (GdSimOrderRes res : list) {
+            KxsGdOrder kxsGdOrder = this.getOne(Wrappers.<KxsGdOrder>lambdaQuery().eq(KxsGdOrder::getOrderNo, res.getOrderNo()));
+            if(kxsGdOrder == null){
+                kxsGdOrder = new KxsGdOrder();
+            }
+            kxsGdOrder.setIccid(res.getIccid());
+            kxsGdOrder.setFirstRechargeAmount(new BigDecimal(res.getFirstRechargeAmount()));
+            kxsGdOrder.setProductName(res.getProductName());
+            kxsGdOrder.setProvince(res.getProvince());
+            kxsGdOrder.setCity(res.getCity());
+            kxsGdOrder.setUserName(res.getUserName());
+            kxsGdOrder.setGdMobile(res.getMobile());
+            kxsGdOrder.setOrderNo(res.getOrderNo());
+            kxsGdOrder.setStatus(Integer.valueOf(res.getStatus()));
+            kxsGdOrder.setIdcardNo(res.getIdcardNo());
+            kxsGdOrder.setReceiveName(res.getReceiveName());
+            kxsGdOrder.setReceiveMobile(res.getReceiveMobile());
+            kxsGdOrder.setAddress(res.getReceiveAddress());
+            kxsGdOrder.setAddressDetail(res.getReceiveAddressDetail());
+            kxsGdOrder.setCreateTime(LocalDateTimeUtil.parse(res.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
+            this.saveOrUpdate(kxsGdOrder);
+            if("6".equals(res.getStatus())){
+                KxsGdReport kxsGdReport = kxsGdReportMapper.selectOne(Wrappers.<KxsGdReport>lambdaQuery()
+                        .eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())
+                        .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_NO.getType())
+                        .eq(KxsGdReport::getGdMobile, kxsGdOrder.getGdMobile()));
+                if (kxsGdReport == null) {
+                    continue;
+                }
+                kxsGdReport.setIsCheck(GdReportEnum.CHECK_SUC.getType());
+                kxsGdReportMapper.updateById(kxsGdReport);
+                kxsGdService.toSendMq(kxsGdOrder, kxsGdReport.getGdSn());
+            }
+        }
+        return Boolean.TRUE;
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void acceptGdActData(Map<String, Object> param) {
+
+        JSONArray dataList = kxsGdService.acceptGdActData(param);
+
+        for (Object obj : dataList) {
+            JSONObject orderData = JSON.parseObject(obj.toString());
+            //订单信息
+            if("1".equals(param.get("type").toString())){
+
+                KxsGdOrder kxsGdOrder = this.getOne(Wrappers.<KxsGdOrder>lambdaQuery().eq(KxsGdOrder::getOrderNo, orderData.getString("orderNo")));
+                if(kxsGdOrder == null){
+                    kxsGdOrder = new KxsGdOrder();
+                }
+                kxsGdOrder.setIccid(orderData.getString("iccid"));
+                kxsGdOrder.setFirstRechargeAmount(new BigDecimal(orderData.getString("firstRechargeAmount")));
+                kxsGdOrder.setProductName(orderData.getString("productName"));
+                kxsGdOrder.setProvince(orderData.getString("province"));
+                kxsGdOrder.setCity(orderData.getString("city"));
+                kxsGdOrder.setUserName(orderData.getString("userName"));
+                kxsGdOrder.setGdMobile(orderData.getString("mobile"));
+                kxsGdOrder.setOrderNo(orderData.getString("orderNo"));
+
+                kxsGdOrder.setIdcardNo(orderData.getString("idcardNo"));
+                kxsGdOrder.setReceiveName(orderData.getString("receiveName"));
+                kxsGdOrder.setReceiveMobile(orderData.getString("receiveMobile"));
+                kxsGdOrder.setAddress(orderData.getString("receiveAddress"));
+                kxsGdOrder.setAddressDetail(orderData.getString("receiveAddressDetail"));
+                kxsGdOrder.setCreateTime(LocalDateTimeUtil.parse(orderData.getString("createTime"), DatePattern.NORM_DATETIME_PATTERN));
+                this.saveOrUpdate(kxsGdOrder);
+            }
+            //激活状态
+            if("2".equals(param.get("type").toString())){
+                String orderNo = orderData.getString("orderNo");
+                //1 订单生成2 订单正在运行3 待发货4 配送中5 订单成功结束6 已激活成功11 办理失败12 拒签13 订单取消中14 订单取消
+                String status = orderData.getString("status");
+                if(StrUtil.isBlank(status) || StrUtil.isBlank(orderNo)){
+                    continue;
+                }
+                KxsGdOrder kxsGdOrder = this.getOne(Wrappers.<KxsGdOrder>lambdaQuery().eq(KxsGdOrder::getOrderNo, orderNo));
+                if (kxsGdOrder == null) {
+                    continue;
+                }
+                kxsGdOrder.setErpName(orderData.getString("logisticsCompany"));
+                kxsGdOrder.setErpNo(orderData.getString("logisticsNo"));
+                kxsGdOrder.setStatus(Integer.valueOf(status));
+                this.updateById(kxsGdOrder);
+                //激活成功
+                if("6".equals(status)){
+                    KxsGdReport kxsGdReport = kxsGdReportMapper.selectOne(Wrappers.<KxsGdReport>lambdaQuery()
+                            .eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())
+                            .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_NO.getType())
+                            .eq(KxsGdReport::getGdMobile, kxsGdOrder.getGdMobile()));
+                    if (kxsGdReport == null) {
+                        continue;
+                    }
+                    kxsGdReport.setIsCheck(GdReportEnum.CHECK_SUC.getType());
+                    kxsGdReportMapper.updateById(kxsGdReport);
+                    kxsGdService.toSendMq(kxsGdOrder, kxsGdReport.getGdSn());
+                }
+
+            }
+        }
+    }
+
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdReportServiceImpl.java

@@ -232,20 +232,6 @@ public class KxsGdReportServiceImpl extends ServiceImpl<KxsGdReportMapper, KxsGd
         return gdDotNumVO;
     }
 
-    @Override
-    public void acceptActData(Map<String, Object> param) {
-
-        log.info("接收到广电交易数据:{}", JSON.toJSONString(param));
-        kxsGdService.acceptGdActData(param);
-
-    }
-
-    @Override
-    public void onlineSimOrder(List<String> orderNos) {
-
-        kxsGdService.onlineSimOrder(orderNos);
-    }
-
 
 }
 

kxs-product/kxs-product-biz/src/main/java/com/kxs/product/biz/service/impl/KxsGdServiceImpl.java

@@ -25,6 +25,7 @@ import com.kxs.product.api.res.gd.GdQueryOrderRes;
 import com.kxs.product.api.res.gd.GdSimOrderRes;
 import com.kxs.product.biz.config.RsaProperties;
 import com.kxs.product.biz.constant.enums.GdReportEnum;
+import com.kxs.product.biz.mapper.KxsGdOrderMapper;
 import com.kxs.product.biz.mapper.KxsGdReportMapper;
 import com.kxs.product.biz.service.KxsGdOrderService;
 import com.kxs.product.biz.service.KxsGdService;
@@ -57,8 +58,6 @@ public class KxsGdServiceImpl implements KxsGdService {
 
     private final IMQSender mqSender;
 
-    private final KxsGdOrderService gdOrderService;
-
     @Async("getAsyncExecutor")
     @Override
     public void checkGdAsyncData(String startTime, String endTime) {
@@ -110,7 +109,7 @@ public class KxsGdServiceImpl implements KxsGdService {
 
 
     @Override
-    public void onlineSimOrder(List<String> orderNos) {
+    public List<GdSimOrderRes> onlineSimOrder(List<String> orderNos) {
         GdSimOrderReq req = GdSimOrderReq.builder()
                 .orderNos(JSON.toJSONString(orderNos))
                 .build();
@@ -119,51 +118,18 @@ public class KxsGdServiceImpl implements KxsGdService {
         if(commRes.getResultCode() != 1){
             throw new GlobalCustomerException(commRes.getErrorDesc());
         }
-        List<GdSimOrderRes> list = commRes.getData();
-        for (GdSimOrderRes res : list) {
-            KxsGdOrder kxsGdOrder = gdOrderService.getOne(Wrappers.<KxsGdOrder>lambdaQuery().eq(KxsGdOrder::getOrderNo, res.getOrderNo()));
-            if(kxsGdOrder == null){
-                kxsGdOrder = new KxsGdOrder();
-            }
-            kxsGdOrder.setIccid(res.getIccid());
-            kxsGdOrder.setFirstRechargeAmount(new BigDecimal(res.getFirstRechargeAmount()));
-            kxsGdOrder.setProductName(res.getProductName());
-            kxsGdOrder.setProvince(res.getProvince());
-            kxsGdOrder.setCity(res.getCity());
-            kxsGdOrder.setUserName(res.getUserName());
-            kxsGdOrder.setGdMobile(res.getMobile());
-            kxsGdOrder.setOrderNo(res.getOrderNo());
-            kxsGdOrder.setStatus(Integer.valueOf(res.getStatus()));
-            kxsGdOrder.setIdcardNo(res.getIdcardNo());
-            kxsGdOrder.setReceiveName(res.getReceiveName());
-            kxsGdOrder.setReceiveMobile(res.getReceiveMobile());
-            kxsGdOrder.setAddress(res.getReceiveAddress());
-            kxsGdOrder.setAddressDetail(res.getReceiveAddressDetail());
-            kxsGdOrder.setCreateTime(LocalDateTimeUtil.parse(res.getCreateTime(), DatePattern.NORM_DATETIME_PATTERN));
-            gdOrderService.saveOrUpdate(kxsGdOrder);
-            if("6".equals(res.getStatus())){
-                KxsGdReport kxsGdReport = kxsGdReportMapper.selectOne(Wrappers.<KxsGdReport>lambdaQuery()
-                        .eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())
-                        .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_NO.getType())
-                        .eq(KxsGdReport::getGdMobile, kxsGdOrder.getGdMobile()));
-                if (kxsGdReport == null) {
-                    continue;
-                }
-                kxsGdReport.setIsCheck(GdReportEnum.CHECK_SUC.getType());
-                kxsGdReportMapper.updateById(kxsGdReport);
-                toSendMq(kxsGdOrder, kxsGdReport.getGdSn());
-            }
-        }
+        return commRes.getData();
+
     }
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public void acceptGdActData(Map<String, Object> param) {
+    public JSONArray acceptGdActData(Map<String, Object> param) {
 
         JSONArray dataList = JSON.parseArray(param.get("data").toString());
         if(dataList.isEmpty()){
             log.error("接收广电订单数据失败:{}", JSON.toJSONString(param));
-            return;
+            throw new GlobalCustomerException("接收广电订单数据失败" + JSON.toJSONString(param));
         }
         try {
             boolean checkSign = GdRsaUtils.checkSign(param, rsaProperties.getGd().getPublicKey());
@@ -174,68 +140,12 @@ public class KxsGdServiceImpl implements KxsGdService {
             throw new GlobalCustomerException("广电接收激活数据验证签名失败");
         }
 
-        for (Object obj : dataList) {
-            JSONObject orderData = JSON.parseObject(obj.toString());
-            //订单信息
-            if("1".equals(param.get("type").toString())){
-
-                KxsGdOrder kxsGdOrder = gdOrderService.getOne(Wrappers.<KxsGdOrder>lambdaQuery().eq(KxsGdOrder::getOrderNo, orderData.getString("orderNo")));
-                if(kxsGdOrder == null){
-                    kxsGdOrder = new KxsGdOrder();
-                }
-                kxsGdOrder.setIccid(orderData.getString("iccid"));
-                kxsGdOrder.setFirstRechargeAmount(new BigDecimal(orderData.getString("firstRechargeAmount")));
-                kxsGdOrder.setProductName(orderData.getString("productName"));
-                kxsGdOrder.setProvince(orderData.getString("province"));
-                kxsGdOrder.setCity(orderData.getString("city"));
-                kxsGdOrder.setUserName(orderData.getString("userName"));
-                kxsGdOrder.setGdMobile(orderData.getString("mobile"));
-                kxsGdOrder.setOrderNo(orderData.getString("orderNo"));
-
-                kxsGdOrder.setIdcardNo(orderData.getString("idcardNo"));
-                kxsGdOrder.setReceiveName(orderData.getString("receiveName"));
-                kxsGdOrder.setReceiveMobile(orderData.getString("receiveMobile"));
-                kxsGdOrder.setAddress(orderData.getString("receiveAddress"));
-                kxsGdOrder.setAddressDetail(orderData.getString("receiveAddressDetail"));
-                kxsGdOrder.setCreateTime(LocalDateTimeUtil.parse(orderData.getString("createTime"), DatePattern.NORM_DATETIME_PATTERN));
-                gdOrderService.saveOrUpdate(kxsGdOrder);
-            }
-            //激活状态
-            if("2".equals(param.get("type").toString())){
-                String orderNo = orderData.getString("orderNo");
-                //1 订单生成2 订单正在运行3 待发货4 配送中5 订单成功结束6 已激活成功11 办理失败12 拒签13 订单取消中14 订单取消
-                String status = orderData.getString("status");
-                if(StrUtil.isBlank(status) || StrUtil.isBlank(orderNo)){
-                    continue;
-                }
-                KxsGdOrder kxsGdOrder = gdOrderService.getOne(Wrappers.<KxsGdOrder>lambdaQuery().eq(KxsGdOrder::getOrderNo, orderNo));
-                if (kxsGdOrder == null) {
-                    continue;
-                }
-                kxsGdOrder.setErpName(orderData.getString("logisticsCompany"));
-                kxsGdOrder.setErpNo(orderData.getString("logisticsNo"));
-                kxsGdOrder.setStatus(Integer.valueOf(status));
-                gdOrderService.updateById(kxsGdOrder);
-                //激活成功
-                if("6".equals(status)){
-                    KxsGdReport kxsGdReport = kxsGdReportMapper.selectOne(Wrappers.<KxsGdReport>lambdaQuery()
-                            .eq(KxsGdReport::getStatus, GdReportEnum.REPORT.getType())
-                            .eq(KxsGdReport::getIsCheck, GdReportEnum.CHECK_NO.getType())
-                            .eq(KxsGdReport::getGdMobile, kxsGdOrder.getGdMobile()));
-                    if (kxsGdReport == null) {
-                        continue;
-                    }
-                    kxsGdReport.setIsCheck(GdReportEnum.CHECK_SUC.getType());
-                    kxsGdReportMapper.updateById(kxsGdReport);
-                    toSendMq(kxsGdOrder, kxsGdReport.getGdSn());
-                }
-
-            }
-        }
+        return dataList;
     }
 
 
-    private void toSendMq(KxsGdOrder order, String sn){
+    @Override
+    public void toSendMq(KxsGdOrder order, String sn){
         RabbitGdActQueueMQ.MsgEntity msgEntity = new RabbitGdActQueueMQ.MsgEntity();
         msgEntity.setPosSn(sn);
         msgEntity.setPhoneNo(order.getGdMobile());