fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/sdk/service/impl/TopNuoMplatformLogServiceImpl.java

@@ -14,6 +14,8 @@ import com.zhongzheng.common.utils.http.HttpUtils;
 import com.zhongzheng.modules.grade.domain.ClassGradeUser;
 import com.zhongzheng.modules.grade.service.impl.UserPeriodServiceImpl;
 import com.zhongzheng.modules.order.domain.OrderGoodsRefund;
+import com.zhongzheng.modules.order.domain.OrderInvoice;
+import com.zhongzheng.modules.order.service.IOrderInvoiceOrderService;
 import com.zhongzheng.modules.sdk.bo.TopNuoMplatformLogAddBo;
 import com.zhongzheng.modules.sdk.bo.TopNuoMplatformLogEditBo;
 import com.zhongzheng.modules.sdk.bo.TopNuoMplatformLogQueryBo;
@@ -22,6 +24,7 @@ import com.zhongzheng.modules.sdk.mapper.TopNuoMplatformLogMapper;
 import com.zhongzheng.modules.sdk.service.ITopNuoMplatformLogService;
 import com.zhongzheng.modules.sdk.service.NuonuoService;
 import com.zhongzheng.modules.sdk.vo.TopNuoMplatformLogVo;
+import com.zhongzheng.modules.top.goods.service.ITopOldOrderService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -52,6 +55,8 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
     private NuonuoService nuonuoService;
     @Value("${oldStudySys.updateInvoicePath}")
     private String UpdateInvoice_PATH;
+    @Autowired
+    private ITopOldOrderService iTopOldOrderService;
 
     @Override
     public TopNuoMplatformLogVo queryById(Long id){
@@ -108,7 +113,9 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
         }
         TopNuoMplatformLog add = BeanUtil.toBean(bo, TopNuoMplatformLog.class);
         validEntityBeforeSave(add);
-        add.setFromPlat(2);
+        if(Validator.isEmpty(add.getFromPlat())){
+            add.setFromPlat(2);//默认旧平台
+        }
         add.setStatus(0);
         add.setCreateTime(DateUtils.getNowTime());
         add.setUpdateTime(DateUtils.getNowTime());
@@ -214,32 +221,41 @@ public class TopNuoMplatformLogServiceImpl extends ServiceImpl<TopNuoMplatformLo
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getStatus, Integer.parseInt(status));
                             objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getFailCause, failCause);
                         }
-                        Map<String, String> params = new HashMap<>();
-                        Long nowTime = DateUtils.getNowTime();
-                        String sign = ToolsUtils.EncoderByMd5(nowTime.toString()+"pubilc2022");
-                        params.put("stamp", nowTime.toString());
-                        params.put("sign", sign);
-                        params.put("status", oldStatus);
-                        params.put("orderno", orderNo);
-                        params.put("pdfurl", pdfUrl);
-                        String respone = "";
-                        log.info("发票推送系统"+params,"");
-                        try {
-                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushStatus, 1);
-                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushTime, DateUtils.getNowTime());
-                            respone = HttpUtils.postFormBody(UpdateInvoice_PATH, params);
-                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushResult, respone);
-                            if (!respone.contains("\"Status\":true")) {
+                        TopNuoMplatformLog mplatformLog = getOne(new LambdaQueryWrapper<TopNuoMplatformLog>().eq(TopNuoMplatformLog::getOrderNo, orderNo));
+                        if(mplatformLog.getFromPlat()==1){
+                            this.update(null, objectLambdaUpdateWrapper);
+                            iTopOldOrderService.orderInvoice(orderNo);
+                        }
+                        else if(mplatformLog.getFromPlat()==2){
+                            //旧系统
+                            Map<String, String> params = new HashMap<>();
+                            Long nowTime = DateUtils.getNowTime();
+                            String sign = ToolsUtils.EncoderByMd5(nowTime.toString()+"pubilc2022");
+                            params.put("stamp", nowTime.toString());
+                            params.put("sign", sign);
+                            params.put("status", oldStatus);
+                            params.put("orderno", orderNo);
+                            params.put("pdfurl", pdfUrl);
+                            String respone = "";
+                            log.info("发票推送系统"+params,"");
+                            try {
+                                objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushStatus, 1);
+                                objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushTime, DateUtils.getNowTime());
+                                respone = HttpUtils.postFormBody(UpdateInvoice_PATH, params);
+                                objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushResult, respone);
+                                if (!respone.contains("\"Status\":true")) {
+                                    objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushStatus, -1);
+                                    this.update(null, objectLambdaUpdateWrapper);
+                                    //                throw new CustomException("同步请求错误"+respone);
+                                }
+                            } catch (IOException e) {
                                 objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushStatus, -1);
                                 this.update(null, objectLambdaUpdateWrapper);
-                //                throw new CustomException("同步请求错误"+respone);
+                                //            throw new CustomException("同步请求错误"+e.getMessage());
                             }
-                        } catch (IOException e) {
-                            objectLambdaUpdateWrapper.set(TopNuoMplatformLog::getPushStatus, -1);
                             this.update(null, objectLambdaUpdateWrapper);
-                //            throw new CustomException("同步请求错误"+e.getMessage());
                         }
-                        this.update(null, objectLambdaUpdateWrapper);
+
                     }
                 }
                 snList.clear();