Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU2/DAL-DAZHOU-JOIN-API

src/main/java/com/steerinfo/dil/controller/WSFaceController.java

@@ -21,7 +21,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.steerinfo.dil.util.newFileTool;
 
+import java.io.IOException;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -86,6 +88,11 @@ public class WSFaceController extends BaseRESTfulController {
             // 这边是map，将map封装后转为json
             String json = JSONUtils.toJSONString(map);
             String res = locator.getWSFaceFacade().invokeJson(json);
+            //try {
+            //    newFileTool.newFile(json + "---->" + res,"销售订单");
+            //} catch (IOException e) {
+            //    e.printStackTrace();
+            //}
             JSONObject request = JSON.parseObject(res);
             String requestException = request.getString("exception");
             output = request.getString("output");
@@ -147,6 +154,11 @@ public class WSFaceController extends BaseRESTfulController {
             // 这边是map，将map封装后转为json
             String json = JSONUtils.toJSONString(map);
             String res = locator.getWSFaceFacade().invokeJson(json);
+            //try {
+            //    newFileTool.newFile(json + "---->" + res,"销售订单");
+            //} catch (IOException e) {
+            //    e.printStackTrace();
+            //}
             JSONObject request = JSON.parseObject(res);
             String requestException = request.getString("exception");
             output = request.getString("output");
@@ -183,6 +195,11 @@ public class WSFaceController extends BaseRESTfulController {
             // 这边是map，将map封装后转为json
             String json = JSONUtils.toJSONString(map);
             String res = locator.getWSFaceFacade().invokeJson(json);
+            //try {
+            //    newFileTool.newFile(json + "---->" + res,"销售订单");
+            //} catch (IOException e) {
+            //    e.printStackTrace();
+            //}
             JSONObject request = JSON.parseObject(res);
             String requestException = request.getString("exception");
             output = request.getString("output");

src/main/java/com/steerinfo/dil/service/impl/AmsSaleOrderServiceImpl.java

@@ -2,6 +2,8 @@ package com.steerinfo.dil.service.impl;
 
 import com.alibaba.druid.support.json.JSONUtils;
 import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.steerinfo.dil.util.newFileTool;
 import com.google.gson.JsonObject;
 import com.steerinfo.dil.feign.AmsFeign;
 import com.steerinfo.dil.mapper.*;
@@ -9,13 +11,18 @@ import com.steerinfo.dil.model.*;
 import com.steerinfo.dil.service.IAmsSaleOrderService;
 import com.steerinfo.dil.util.DataChange;
 import com.steerinfo.dil.util.MyException;
+import com.sun.org.apache.bcel.internal.generic.NEW;
 import org.apache.ibatis.executor.loader.ResultLoader;
+import org.assertj.core.internal.bytebuddy.implementation.FieldAccessor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import springfox.documentation.spring.web.json.Json;
 
 import javax.xml.crypto.Data;
+import java.io.IOException;
 import java.math.BigDecimal;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
@@ -63,6 +70,8 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Autowired
     AmsFeign amsFeign;
 
+    Logger logger = LoggerFactory.getLogger(getClass());
+
     /**
      * 查询销售订单
      * @param saleOrderId
@@ -117,8 +126,14 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
     @Override
     public int operationSaleOrder(Map<String, Object> mapVal) {
         System.out.println("-----------------------------" + new Date() + "销售订单对接接口" + "-----------------------------");
-        System.out.println(mapVal);
+        JSONObject jsonObject = new JSONObject(mapVal);
+        logger.info(jsonObject.toString());
         System.out.println("-----------------------------" + new Date() + "销售订单对接接口" + "-----------------------------");
+        //try {
+        //    newFileTool.newFile(jsonObject.toString(),"销售订单");
+        //} catch (IOException e) {
+        //    e.printStackTrace();
+        //}
         int result = 0;
         // 审批状态
         String orderStatus = (String) mapVal.get("orderStatus");
@@ -138,7 +153,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
         // 是否整单
         Object wholeOrder = mapVal.get("wholeOrder");
         // 关闭副产品整个订单
-        if (closeStatus.equals("-1") && "1".equals(wholeOrder)) {
+        if (closeStatus.equals("-1") && "1".equals(wholeOrder) && amsSaleOrders.size() != 0 && amsSaleOrders.get(0) != null) {
             AmsSaleOrder amsSaleOrder = amsSaleOrders.get(0);
             amsSaleOrder.setDeleted(new BigDecimal(2));
             if (reason != null) {
@@ -147,7 +162,7 @@ public class AmsSaleOrderServiceImpl implements IAmsSaleOrderService {
             result += amsSaleMaterialMapper.closeAllSaleMaterial(amsSaleOrder.getSaleOrderId());
             result += amsSaleOrderMapper.updateByPrimaryKeySelective(amsSaleOrder);
             List<Map<String, Object>> warehouseList = amsSaleOrderMapper.getWareHouse(amsSaleOrder.getSaleOrderId());
-            if (warehouseList != null && warehouseList.size() != 0) {
+            if (warehouseList != null && warehouseList.size() != 0 && warehouseList.get(0) != null) {
                 Object warehouse = warehouseList.get(0).get("warehouse");
                 if (warehouse != null && "副产品库".equals(warehouse)) {
                     result += amsSaleOrderMapper.closeOrderNotIn(amsSaleOrder.getSaleOrderId());

src/main/java/com/steerinfo/dil/service/impl/TmstruckWeightResultServiceImpl.java

@@ -8,10 +8,14 @@ import com.steerinfo.dil.model.TmstruckReceiveResult;
 import com.steerinfo.dil.model.TmstruckWeightResult;
 import com.steerinfo.dil.service.ITmstruckWeightResultService;
 import com.steerinfo.dil.util.DataChange;
+import com.steerinfo.dil.util.newFileTool;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.io.IOException;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.*;
@@ -65,6 +69,8 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     //老厂区需要给金蝶回传的数据订单类型
     final private List<Integer> judgeToKDTypeList = Arrays.asList(5,6,7,8,17,18,23,20);
 
+    Logger logger = LoggerFactory.getLogger(getClass());
+
     /**
      * 接收达钢计量实绩信息
      *      "orderNumber":"WYSDD2021091000000002",
@@ -126,8 +132,13 @@ public class TmstruckWeightResultServiceImpl implements ITmstruckWeightResultSer
     public String addTruckWeightResult(Map<String, Object> map) {
         System.out.println("---------------------------------" + new Date() + "新接收到的计量实绩" + "---------------------------------");
         JSONObject jsonObject = new JSONObject(map);
-        System.out.println(jsonObject);
+        logger.info("计量信息:{}", jsonObject.toString());
         System.out.println("---------------------------------" + new Date() + "新接收到的计量实绩"  + "---------------------------------");
+        //try {
+        //    newFileTool.newFile(jsonObject.toString(),"计量");
+        //} catch (IOException e) {
+        //    e.printStackTrace();
+        //}
         if(map.get("flag") != null && map.get("flag").equals("GCXS")){
             System.out.println("这是钢材销售");
             TmstruckWeightResult tmstruckWeightResult = null;

src/main/java/com/steerinfo/dil/util/newFileTool.java

@@ -0,0 +1,39 @@
+package com.steerinfo.dil.util;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.zip.CheckedOutputStream;
+
+public class newFileTool {
+
+    public static int newFile(String jsonString,String type) throws IOException {
+        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+        String date  = sdf.format(new Date());
+        File file = new File("../log/" + date + "-" + type);
+        FileWriter fileWriter = new FileWriter(file,true);
+        SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        fileWriter.append("\n");
+        fileWriter.append(sdf1.format(new Date()) + "-----------------------");
+        fileWriter.append("\n");
+        fileWriter.append(jsonString);
+        fileWriter.append("\n");
+        fileWriter.append(sdf1.format(new Date()) + "-----------------------");
+        fileWriter.append("\n");
+        fileWriter.flush();
+        fileWriter.close();
+        return 1;
+    }
+
+    //public static void main(String[] args) {
+    //    //System.out.println(new Date().getDate());
+    //
+    //    try {
+    //        newFile("我输入一个文件","计量");
+    //    } catch (IOException e) {
+    //        e.printStackTrace();
+    //    }
+    //}
+}

src/main/resources/com/steerinfo/dil/mapper/AmsSaleOrderMapper.xml

@@ -935,6 +935,7 @@
       WHERE ASOM.SALE_ORDER_ID = #{saleOrderId}
         AND TER.RESULT_ENTRY_GATE_TIME IS NULL
         AND OO.ORDER_ID IS NOT NULL
+        AND OO.ORDER_TYPE IN (1,2)
         AND OO.ORDER_STATUS IN (4,5)
     )
   </update>

src/main/resources/log4j.properties

@@ -53,7 +53,7 @@ log4j.logger.com.steer.rbac.sysdebuglog.service.DebugLogRecord = DEBUG,DEB
 log4j.appender.DEB = org.apache.log4j.DailyRollingFileAppender
 log4j.appender.DEB.File = /logs/debug/debug.log
 log4j.appender.DEB.Append = true
-log4j.appender.DEB.Threshold = DEBUG 
+log4j.appender.DEB.Threshold = DEBUG
 log4j.appender.DEB.DatePattern='.'yyyy-MM-dd
 log4j.appender.DEB.layout = org.apache.log4j.PatternLayout
 log4j.appender.DEB.layout.ConversionPattern = %d{yyyy-MM-dd HH:mm:ss,SSS}:%5p %20t [%50F:%3L] - %m%n