修复相同单号

sp-core/sp-base/src/main/java/com/pj/project4sp/apilog/SpApilogUtil.java

@@ -71,8 +71,8 @@ public class SpApilogUtil {
         request.setAttribute(APILOG_OBJ_SAVE_KEY, a);
 
         // 控制台日志
-        LogUtil.info("----------------------------------------------------------------");
-        LogUtil.info("IP: " + a.getReqIp() + "\tr-> " + a.getReqApi() + "\tp-> " + a.getReqParame());
+       // LogUtil.info("----------------------------------------------------------------");
+       // LogUtil.info("IP: " + a.getReqIp() + "\tr-> " + a.getReqApi() + "\tp-> " + a.getReqParame());
     }
 
 
@@ -105,10 +105,9 @@ public class SpApilogUtil {
             a.setCostTime((int) (a.getEndTime().getTime() - a.getStartTime().getTime()));
 
             // res 字符串过长时禁止写入
-            if (a.getResString().length() > 50000) {
+            if (a.getResString().length() > 500) {
                 a.setResString("{\"msg\": \"数据过长，无法写入 (length=" + a.getResString().length() + ")\"}");
             }
-
             LogUtil.info("本次请求耗时：" + ((a.getCostTime() + 0.0) / 1000) + "s, 返回：" + a.getResString());
             a.setCreateTime(new Date());
             spApilogMapper.saveObj(a);

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlement.java

@@ -197,24 +197,6 @@ public class HtTradeSettlement extends Model<HtTradeSettlement> implements Seria
 	 */
 	private String goodsNames;
 
-	/**
-	 * 购买边民列表[     { "platSeqNo": "进出境申报单预申报编号",        "borderName": "边民姓名", "idno": "身份证号",        "borderPutrecNo": "边民备案编号",        "settleBillNo": "结算单号", "buyAmount": "申报金额", "netWt": "净重", "grossWt": "毛重",        "buyQty": "申报数量", "buyQty1": "第一数量",        "buyQty2": "第二数量", "preIeportNo": "进出口预申报单号"     }]
-	 */
-	@JSONField(serialize = false)
-	private String bordersList;
-
-	/**
-	 * 边民购买商品列表[     { "platSeqNo": "进出境申报单预申报编号",        "borderName": "边民姓名",        "idno": "身份证号",           "borderPutrecNo": "边民备案编号",        "buyAmount": "申报金额",        "netWt": "净重",          "grossWt": "毛重",        "buyQty": "申报数量",        "buyQty1": "第一数量",        "buyQty2": "第二数量",        "preIeportNo": "进出口预申报单号",        "codeTs": "商品编码",        "goodsName": "商品名称"      }]
-	 */
-	@JSONField(serialize = false)
-	private String borderBuyGoodsList;
-
-	/**
-	 * 商铺卖货物列表[       { "platSeqNo": "进出境申报单预申报编号",           "gNo": "预申报编号", "codeTs": "商品编码",           "gName": "商品名称", "gModel": "规格型号",           "storageEnvm": "储存条件：常温 1：冷藏，2：冷冻：3",            "useTo": "用途：01 食用、02 工业用、03 药用、04 种用、05 饲用、06 其他",           "grossWt": "毛重",            "netWt": "净重",            "originCountry": "产销国",            "gQty": "货物数量",            "qty1": "第一数量",            "qty2": "第二数量",            "gUnit": "计量单位",            "unit1": "第一计量单位",            "unit2": "第二计量单位",            "declPrice": "单价",            "declTotal": "总价"       }]
-	 */
-	@JSONField(serialize = false)
-	private String sellGoodsList;
-
 
 	/**
 	 * 完成情况

sp-service/level-one-server/src/main/java/com/pj/ht_trade_settlement/HtTradeSettlementMapper.xml

@@ -51,8 +51,6 @@
 			<if test=' this.has("voyageNo") '> and voyage_no = #{voyageNo} </if>
 			<if test=' this.has("finishStatus") '> and finish_status = #{finishStatus} </if>
 			<if test=' this.has("goodsNames") '> and goods_names like concat('%',#{goodsNames},'%') </if>
-			<if test=' this.has("bordersList") '> and borders_list = #{bordersList} </if>
-			<if test=' this.has("borderBuyGoodsList") '> and border_buy_goods_list = #{borderBuyGoodsList} </if>
 			<if test=' this.has("enterpriseId") '> and enterprise_id = #{enterpriseId} </if>
 			<if test=' this.has("returns") '> and returns = #{returns} </if>
 			<if test=' this.has("chargebacks") '> and chargebacks = #{chargebacks} </if>

sp-service/level-one-server/src/main/java/com/pj/tb_import_order/TbImportOrder.java

@@ -3,6 +3,7 @@ package com.pj.tb_import_order;
 import java.io.Serializable;
 import java.util.Date;
 
+import com.alibaba.fastjson.annotation.JSONField;
 import com.baomidou.mybatisplus.annotation.*;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import com.fasterxml.jackson.annotation.JsonFormat;
@@ -96,10 +97,6 @@ public class TbImportOrder extends Model<TbImportOrder> implements Serializable
 	private String msgId;
 	private String entCode;
 	private String entName;
-	private String borderPeopleList;
-	private String borderPeopleLimitList;
-	private String goodsList;
-
 	private String cooperEntrustImg;
 	private String judgeBy;
 	private Integer judgeStatus;