增加日志

sp-core/sp-api/src/main/java/com/pj/api/dto/PaymentDto.java

@@ -176,14 +176,17 @@ public class PaymentDto implements Serializable {
 	//边民姓名
 	private String borderName;
 	//证件类型
+	private String papersType;
 	//边民证件号
 	private String borderidno;
 	//国籍
+	private String borderNationality;
 	//银行账号
 	private String bankCode;
 	//银行名称
 	private String bankName;
 	//银行代码
+	private String bankNo;
 	//联系电话
 	private String borderTel;
 
@@ -212,6 +215,8 @@ public class PaymentDto implements Serializable {
 	private Double buyQty;
 	//商品重量(毛重)
 	private Double grossWt;
+	//商品重量(净重)
+	private Double netWt;
 
 	private String tradeNos;
 
@@ -303,6 +308,14 @@ public class PaymentDto implements Serializable {
 		this.grossWt = grossWt;
 	}
 
+	public Double getNetWt() {
+		return netWt;
+	}
+
+	public void setNetWt(Double netWt) {
+		this.netWt = netWt;
+	}
+
 	public String getBorderName() {
 		return borderName;
 	}
@@ -319,6 +332,22 @@ public class PaymentDto implements Serializable {
 		this.borderidno = borderidno;
 	}
 
+	public String getPapersType() {
+		return papersType;
+	}
+
+	public void setPapersType(String papersType) {
+		this.papersType = papersType;
+	}
+
+	public String getBorderNationality() {
+		return borderNationality;
+	}
+
+	public void setBorderNationality(String borderNationality) {
+		this.borderNationality = borderNationality;
+	}
+
 	public String getBankCode() {
 		return bankCode;
 	}
@@ -335,6 +364,14 @@ public class PaymentDto implements Serializable {
 		this.bankName = bankName;
 	}
 
+	public String getBankNo() {
+		return bankNo;
+	}
+
+	public void setBankNo(String bankNo) {
+		this.bankNo = bankNo;
+	}
+
 	public String getBorderTel() {
 		return borderTel;
 	}

sp-service/async-server/src/main/java/com/pj/task/HtByteTask.java

@@ -213,6 +213,7 @@ public class HtByteTask {
                     HtPassCardDTO htPassCardDTO = JSONObject.parseObject(body, HtPassCardDTO.class);
                     //系统接收到航通过卡记录且卡口类型为'3卡'：车辆已出一级市场, 修改相对应的一级市场订单状态
                     if ("3卡".equals(htPassCardDTO.getChannelType())|| StrUtil.contains(htPassCardDTO.getChannelName(),"三卡")) {
+                        StaticLog.info("\n3卡放行记录（过卡记录）信息： htPassCardDTO = " + htPassCardDTO.toString() + "\n");
                         flag = FeignFactory.levelOneServerInterface.orderFinish(htPassCardDTO);
                         methodHtByteTask.updateHtByteInfo(flag, item, dataDto);
                         if (flag) {

sp-service/level-one-server/src/main/java/com/pj/tb_order/TbOrderService.java

@@ -449,6 +449,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         paymentDto.setTradeNo(tbOrder.getTradeNo());
         paymentDto.setBuyQty(tbOrder.getBuyQty());
         paymentDto.setGrossWt(tbOrder.getGrossWt());
+        paymentDto.setNetWt(tbOrder.getNetWt());
         paymentDto.setGoodsName(tbOrder.getGoodsNames());
         paymentDto.setGoodsUnit(tbOrder.getGoodsUnit());
         paymentDto.setDeclPrice(tbOrder.getDeclPrice());
@@ -462,9 +463,12 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         if (tbPeople != null) {
             paymentDto.setBankCode(tbPeople.getBankCode());
             paymentDto.setBankName(tbPeople.getBankName());
+            paymentDto.setBankNo(tbPeople.getBankNo());
             paymentDto.setBorderName(tbPeople.getName());
             paymentDto.setBorderidno(tbPeople.getIdCard());
             paymentDto.setBorderTel(tbPeople.getPhone());
+            paymentDto.setPapersType(tbPeople.getPapersType());
+            paymentDto.setBorderNationality(tbPeople.getNationality());
         }
 
         TbShop tbShop = tbShopService.findByCode(htTradeSettlement.getShopNo());

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeople.java

@@ -14,7 +14,7 @@ import java.util.Date;
 
 /**
  * Model: tb_people -- 边民
- * @author yzs 
+ * @author yzs
  */
 @Data
 @Accessors(chain = true)
@@ -24,15 +24,15 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 
 	// ---------- 模块常量 ----------
 	/**
-	 * 序列化版本id 
+	 * 序列化版本id
 	 */
-	private static final long serialVersionUID = 1L;	
+	private static final long serialVersionUID = 1L;
 	/**
-	 * 此模块对应的表名 
+	 * 此模块对应的表名
 	 */
-	public static final String TABLE_NAME = "tb_people";	
+	public static final String TABLE_NAME = "tb_people";
 	/**
-	 * 此模块对应的权限码 
+	 * 此模块对应的权限码
 	 */
 	public static final String PERMISSION_CODE = "tb-people";
 	public static final String PERMISSION_CODE_ADD = "tb-people-add";
@@ -45,250 +45,250 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 
 	// ---------- 表中字段 ----------
 	/**
-	 * 主键 
+	 * 主键
 	 */
 	@TableId(type = IdType.AUTO)
 	private Long id;
 
 	/**
-	 * 互市区id 
+	 * 互市区id
 	 */
-	private Long tradeAreaId;	
+	private Long tradeAreaId;
 
 	/**
-	 * 互市区名称 
+	 * 互市区名称
 	 */
-	private String tradeAreaName;	
+	private String tradeAreaName;
 
 	/**
-	 * 姓名 
+	 * 姓名
 	 */
 	private String name;
 
 	/**
-	 * 边民号 
+	 * 边民号
 	 */
-	private String code;	
+	private String code;
 
 	/**
-	 * 性别(1=男,2=女) 
+	 * 性别(1=男,2=女)
 	 */
 	private Integer sex;
 
 	/**
-	 * 年龄 
+	 * 年龄
 	 */
-	private Integer age;	
+	private Integer age;
 
 	/**
-	 * 身份证 
+	 * 身份证
 	 */
 	private String idCard;
 
 	/**
-	 * 身份证复印件 
+	 * 身份证复印件
 	 */
-	private String idCardImg;	
+	private String idCardImg;
 
 	/**
-	 * 手机号码 
+	 * 手机号码
 	 */
 	private String phone;
 
 	/**
-	 * 银行编号 
+	 * 银行编号
 	 */
-	private String bankNo;	
+	private String bankNo;
 
 	/**
-	 * 银行卡号 
+	 * 银行卡号
 	 */
-	private String bankCode;	
+	private String bankCode;
 
 	/**
-	 * 银行名称 
+	 * 银行名称
 	 */
-	private String bankName;	
+	private String bankName;
 
 	/**
-	 * 所属互助组(1=测试组) 
+	 * 所属互助组(1=测试组)
 	 */
-	private Long groupId;	
+	private Long groupId;
 
 	/**
-	 * 互助组名称 
+	 * 互助组名称
 	 */
-	private String groupName;	
+	private String groupName;
 
 	/**
-	 * 是否可用(0=否,1=是) 
+	 * 是否可用(0=否,1=是)
 	 */
 	private Integer status;
 
 	/**
-	 * 角色(1=普通边民,2=兼组长) 
+	 * 角色(1=普通边民,2=兼组长)
 	 */
 	private Integer role;
 
 	/**
-	 * 经度 
+	 * 经度
 	 */
-	private Double lng;	
+	private Double lng;
 
 	/**
-	 * 纬度 
+	 * 纬度
 	 */
-	private Double lat;	
+	private Double lat;
 
 	/**
-	 * 最后一次下单定位 
+	 * 最后一次下单定位
 	 */
-	private String lastLocation;	
+	private String lastLocation;
 
 	/**
-	 * 联系地址 
+	 * 联系地址
 	 */
-	private String address;	
+	private String address;
 
 	/**
-	 * 地址ID 
+	 * 地址ID
 	 */
-	private String addressIds;	
+	private String addressIds;
 
 	/**
-	 * 详细地址 
+	 * 详细地址
 	 */
-	private String detailAddress;	
+	private String detailAddress;
 
 	/**
-	 * 是否锁定 
+	 * 是否锁定
 	 */
 	private Integer isLock;
 
 	/**
-	 * 当天剩余额度 
+	 * 当天剩余额度
 	 */
-	private Double leftPrice;	
+	private Double leftPrice;
 
 	/**
-	 * 审核状态 
+	 * 审核状态
 	 */
 	private Integer judgeStatus;
 
 	/**
-	 * 审核不通过内容 
+	 * 审核不通过内容
 	 */
-	private String judgeContent;	
+	private String judgeContent;
 
 	/**
-	 * 注册时间 
+	 * 注册时间
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date registerTime;
 
 	/**
-	 * 审核时间 
+	 * 审核时间
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date judgeTime;
 
 	/**
-	 * 审核人ID 
+	 * 审核人ID
 	 */
-	private String personId;	
+	private String personId;
 
 	/**
-	 * 创建时间 
+	 * 创建时间
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date createTime;
 
 	/**
-	 * 创建人编号 
+	 * 创建人编号
 	 */
-	private String createBy;	
+	private String createBy;
 
 	/**
-	 * 创建人名称 
+	 * 创建人名称
 	 */
-	private String createName;	
+	private String createName;
 
 	/**
-	 * 更新时间 
+	 * 更新时间
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date updateTime;
 
 	/**
-	 * 更新人编号 
+	 * 更新人编号
 	 */
-	private String updateBy;	
+	private String updateBy;
 
 	/**
-	 * 更新人名称 
+	 * 更新人名称
 	 */
-	private String updateName;	
+	private String updateName;
 
 	/**
-	 * 删除状态(0=禁用,1=启用) 
+	 * 删除状态(0=禁用,1=启用)
 	 */
-	private Integer deleteStatus;	
+	private Integer deleteStatus;
 
 	/**
-	 * 地方平台的内部业务编号，每次申请都是新编号 
+	 * 地方平台的内部业务编号，每次申请都是新编号
 	 */
-	private String platSeqNo;	
+	private String platSeqNo;
 
 	/**
-	 * 身份证有效期起，身份证有效期起必须小于身份证有效期止;格式：yyyy-MM-dd 
+	 * 身份证有效期起，身份证有效期起必须小于身份证有效期止;格式：yyyy-MM-dd
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date startDate;
 
 	/**
-	 * 身份证有效期止，身份证有效期止必须大于身份证有效期起;格式：yyyy-MM-dd 
+	 * 身份证有效期止，身份证有效期止必须大于身份证有效期起;格式：yyyy-MM-dd
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date endDate;
 
 	/**
-	 * 身份证发证机关 
+	 * 身份证发证机关
 	 */
-	private String idcdGcertPgoffNm;	
+	private String idcdGcertPgoffNm;
 
 	/**
-	 * 户籍地址 
+	 * 户籍地址
 	 */
-	private String birplAddr;	
+	private String birplAddr;
 
 	/**
-	 * 关区代码，参见关区代码表 
+	 * 关区代码，参见关区代码表
 	 */
-	private String customsCode;	
+	private String customsCode;
 
 	/**
-	 * 有 效 效 截 止 时 间yyyy-MM-dd 
+	 * 有 效 效 截 止 时 间yyyy-MM-dd
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd")
 	private Date expiry;
 
 	/**
-	 * 备案编号，如果为新增备案，传空值；如果为变更备案，必须传值； 
+	 * 备案编号，如果为新增备案，传空值；如果为变更备案，必须传值；
 	 */
-	private String putrecNo;	
+	private String putrecNo;
 
 	/**
-	 * 地方政府编号 
+	 * 地方政府编号
 	 */
-	private String localGovernmentNo;	
+	private String localGovernmentNo;
 
 	/**
-	 * 备案状态：默认 0=待申报，1=已申报，2=备案通过，3=备案失败 
+	 * 备案状态：默认 0=待申报，1=已申报，2=备案通过，3=备案失败
 	 */
 	private String filingStatus;
 
 	/**
-	 *  场所编码 
+	 *  场所编码
 	 */
 	private String fieldCode;
 
@@ -297,10 +297,13 @@ public class TbPeople extends Model<TbPeople> implements Serializable {
 	private Long shopId;
 
 
+	//证件类型
+	private String papersType;
+	//国籍
+	private String nationality;
 
 
 
-	
 
 
 }

sp-service/level-one-server/src/main/java/com/pj/tb_people/TbPeopleService.java

@@ -728,6 +728,8 @@ public class TbPeopleService extends ServiceImpl<TbPeopleMapper, TbPeople> imple
         wrapper.set(TbPeople::getPhone, bankInfoDto.getTel());
         wrapper.set(TbPeople::getBankNo, bankInfoDto.getPayBankCode());
         wrapper.set(TbPeople::getBankCode, bankInfoDto.getAccount());
+        wrapper.set(TbPeople::getPapersType, bankInfoDto.getPapersType());
+        wrapper.set(TbPeople::getNationality, bankInfoDto.getNationality());
 
         wrapper.eq(TbPeople::getIdCard, bankInfoDto.getPapersNo());
         wrapper.eq(TbPeople::getName, bankInfoDto.getName());

sp-service/level-one-server/src/main/java/com/pj/tb_shop/TbShopService.java

@@ -354,9 +354,9 @@ public class TbShopService extends ServiceImpl<TbShopMapper, TbShop> implements
         wrapper.set(TbShop::getShopSccd, bankInfoDto.getPapersNo());
         wrapper.set(TbShop::getOwnerTel, bankInfoDto.getTel());
         wrapper.set(TbShop::getBankAccount, bankInfoDto.getAccount());
-        wrapper.set(TbShop::getBank, bankInfoDto.getSwiftCode());
+        wrapper.set(TbShop::getBank, bankInfoDto.getPayBankCode());
         wrapper.set(TbShop::getNationality, bankInfoDto.getNationality());
-        wrapper.set(TbShop::getAbroad, bankInfoDto.getAbroad());
+        //wrapper.set(TbShop::getAbroad, bankInfoDto.getAbroad());
 
         wrapper.eq(TbShop::getOwnerName, bankInfoDto.getName());
 

sp-service/payment-server/src/main/java/com/pj/task/BankByteTask.java

@@ -1,5 +1,6 @@
 package com.pj.task;
 
+import cn.hutool.log.StaticLog;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -81,17 +82,19 @@ public class BankByteTask {
      */
     @Scheduled(cron = "*/10 * * * * ?")  // 每10秒扫描一次
     public void bankByteTask() throws ParserConfigurationException {
+        StaticLog.info("\n  ----------------银行数据处理定时任务开始----------------------");
 
         //扫描表内是否有待处理任务
         List<BankByte> byteList = bankByteMapper.selectList(
                 new LambdaQueryWrapper<BankByte>().eq(BankByte::getFinishStatus, FinishStatus.FINISH_STATUS_ZERO.getCode()).orderByAsc(BankByte::getCreateTime));
         //判断是否有任务,没有则返回
         if (byteList.size() == 0) {
-            System.err.println("\n  ---  暂无待处理【银行回执信息】。" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "\n");
+            StaticLog.info("\n  ---  暂无待处理【银行回执信息】。" + new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date()) + "\n");
             return;
         }
         //执行任务处理流程
         for (BankByte item : byteList) {
+            StaticLog.info("\n  ----------------执行任务处理流程----------------------\n" + item.toString());
             // 创建DOM解析器
             DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance();
             DocumentBuilder builder = factory.newDocumentBuilder();

sp-service/payment-server/src/main/java/com/pj/xml/MessageXML.java

@@ -1,6 +1,7 @@
 package com.pj.xml;
 
 
+import cn.hutool.log.StaticLog;
 import com.pj.api.dto.CompanyDto;
 import com.pj.api.dto.PaymentDto;
 import com.pj.api.dto.PaymentTwoDto;
@@ -28,7 +29,7 @@ public class MessageXML {
                         "<date>" + paymentDto.getDeclTime() + "</date>\n" +    //结关时间	YYYY-MM—DD HH：MM：DD SSS
                 "</payload>";
         String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
-                "<message title=\"边民互市\" xsi:schemaLocation=\"\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n" +
+                "<message title=\"一级市场\" xsi:schemaLocation=\"\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">\n" +
                 "<headers>\n" +
                 "        <item>\n" +
                 "               <key>sn</key>\n" +
@@ -51,10 +52,12 @@ public class MessageXML {
                 "              <value>CXB001</value>\n" +
                 "       </item>\n" +
                 "</headers>\n" +
-                "<plain>" +
-                CryptoUtil.encrypt(payload)+
-                "</plain>" +
+                payload +
+                //"<plain>" +
+                //CryptoUtil.encrypt(payload)+
+                //"</plain>" +
                 "</message>";
+        StaticLog.info("\n --------发送报文--------CXB001--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -65,13 +68,13 @@ public class MessageXML {
         String date = sdf.format(new Date());
         String payload =" <payload xsi:type=\"responseDTO\">" +
                         "         <code>200</code>\n" +                                 //消息回执代码
-                        "         <source>" + bankInfo.getSn() + "</source>\n" +    //源报文编号
+                        "         <source>" + bankInfo.getSn() + "</source>\n" +        //源报文编号
                         "         <note>边民已备案</note>\n" +                           //回执内容
                         "<results xsi:type=\"vendeeDTO\">\n" +
-                        "         <name>" + bankInfo.getName() + "</name>\n" +                       //边民姓名
-                        "         <papersType>" + bankInfo.getPapersType() + "</papersType>\n" +       //证件类型  0001 身份证
-                        "         <papersNo>" + bankInfo.getPapersNo() + "</papersNo>\n" +             //边民证件号
-                        "         <nationality>" + bankInfo.getNationality() + "</nationality>\n" +  //国籍
+                        "         <name>" + bankInfo.getName() + "</name>\n" +                          //边民姓名
+                        "         <papersType>" + bankInfo.getPapersType() + "</papersType>\n" +        //证件类型  0001 身份证
+                        "         <papersNo>" + bankInfo.getPapersNo() + "</papersNo>\n" +              //边民证件号
+                        "         <nationality>" + bankInfo.getNationality() + "</nationality>\n" +     //国籍
                         "</results>\n" +
                         "</payload>";
         String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
@@ -102,6 +105,7 @@ public class MessageXML {
                 CryptoUtil.encrypt(payload)+
                 "</plain>" +
                 "</message>";
+        StaticLog.info("\n --------发送报文--------SXB003--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -112,7 +116,7 @@ public class MessageXML {
         String date = sdf.format(new Date());
         String payload =" <payload xsi:type=\"responseDTO\">" +
                 "         <code>500</code>\n" +                                 //消息回执代码
-                "         <source>" + bankInfo.getSn() + "</source>\n" +    //源报文编号
+                "         <source>" + bankInfo.getSn() + "</source>\n" +        //源报文编号
                 "         <note>边民未备案</note>\n" +                           //回执内容
                 "</payload>";
         String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
@@ -143,6 +147,7 @@ public class MessageXML {
                 CryptoUtil.encrypt(payload)+
                 "</plain>" +
                 "</message>";
+        StaticLog.info("\n --------发送报文--------SXB004--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -154,13 +159,13 @@ public class MessageXML {
         String payload =
                 " <payload xsi:type=\"responseDTO\">" +
                 "         <code>200</code>\n" +                                 //消息回执代码
-                "         <source>" + bankInfo.getSn() + "</source>\n" +    //源报文编号
+                "         <source>" + bankInfo.getSn() + "</source>\n" +        //源报文编号
                 "         <note>商铺已备案</note>\n" +                           //回执内容
                 "<results xsi:type=\"vendeeDTO\">\n" +
-                "         <name>" + bankInfo.getName() + "</name>\n" +                       //商铺所属人姓名
-                "         <papersType>" + bankInfo.getPapersType() + "</papersType>\n" +       //所属人证件类型  0001 身份证
-                "         <papersNo>" + bankInfo.getPapersNo() + "</papersNo>\n" +             //所属人证件号
-                "         <nationality>" + bankInfo.getNationality() + "</nationality>\n" +  //国籍
+                "         <name>" + bankInfo.getName() + "</name>\n" +                          //商铺所属人姓名
+                "         <papersType>" + bankInfo.getPapersType() + "</papersType>\n" +        //所属人证件类型  0001 身份证
+                "         <papersNo>" + bankInfo.getPapersNo() + "</papersNo>\n" +              //所属人证件号
+                "         <nationality>" + bankInfo.getNationality() + "</nationality>\n" +     //国籍
                 "</results>\n" +
                 "</payload>";
         String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
@@ -191,6 +196,7 @@ public class MessageXML {
                 CryptoUtil.encrypt(payload)+
                 "</plain>" +
                 "</message>";
+        StaticLog.info("\n --------发送报文--------SXB007--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -233,6 +239,7 @@ public class MessageXML {
                 CryptoUtil.encrypt(payload)+
                 "</plain>" +
                 "</message>";
+        StaticLog.info("\n --------发送报文--------SXB008--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -244,37 +251,38 @@ public class MessageXML {
         String payload =
                 "<payload xsi:type=\"orderDTO\">" +
                 "         <sn>" + paymentDto.getTradeNo() + "</sn>\n" +                         //订单号
-                "         <export>false</export>\n" +                                       //出口标识	true：出口，false：进口
+                "         <export>false</export>\n" +                                           //出口标识	true：出口，false：进口
                 "         <organization>" + paymentDto.getFieldCode() + "</organization>\n" +   //互市点机构代码
                 "         <currency>" + paymentDto.getCurrCode() + "</currency>\n" +            //币种
-                "         <type>01</type>\n" +                                              //业务类型	01 代表扣款报文
-                "         <charging>" + paymentDto.getResalePrice() + "</charging>\n" +         //计费金额(二级市场转售总金额)
+                "         <type>01</type>\n" +                                                  //业务类型	01 代表扣款报文
+                //"         <charging>" + paymentDto.getResalePrice() + "</charging>\n" +       //计费金额(二级市场转售总金额):charging送0
+                "         <charging>0</charging>\n" +                                           //一级市场订单还没有上架计费:charging送0
                 "         <total>" + paymentDto.getTotalPrice() + "</total>\n" +                //总金额8000.00(一级市场边民订单金额)
                 "         <date>" + paymentDto.getDeclTime() + "</date>\n" +                    //订单时间	YYYY-MM—DD HH：MM：DD SSS
                 "<vendee>\n" +
-                "         <name>" + paymentDto.getBorderName() + "</name>\n" +                 //边民姓名
-                "         <papersType>0001</papersType>\n" +                                 //证件类型  0001 身份证
-                "         <papersNo>" + paymentDto.getBorderidno() + "</papersNo>\n" +           //边民证件号
-                "         <nationality>0001</nationality>\n" +                             //国籍
-                "         <account>" + paymentDto.getBankCode() + "</account>\n" +         //银行账号
-                "         <bankCode>MRCCCNB1</bankCode>\n" +                            //开户行代码
-                "         <tel>" + paymentDto.getBorderTel() + "</tel>\n" +                    //联系电话
+                "         <name>" + paymentDto.getBorderName() + "</name>\n" +                  //边民姓名
+                "         <papersType>" + paymentDto.getPapersType() + "</papersType>\n" +      //证件类型  0001 身份证
+                "         <papersNo>" + paymentDto.getBorderidno() + "</papersNo>\n" +          //边民证件号
+                "         <nationality>" + paymentDto.getBorderNationality() + "</nationality>\n" +  //国籍
+                "         <account>" + paymentDto.getBankCode() + "</account>\n" +              //银行账号
+                "         <bankCode>" + paymentDto.getBankNo() + "</bankCode>\n" +              //开户行代码
+                "         <tel>" + paymentDto.getBorderTel() + "</tel>\n" +                     //联系电话
                 "</vendee>\n" +
                 "<vendor>\n" +
-                "         <name>" + paymentDto.getOwnerName() + "</name>\n" +                  //商铺所属人姓名
-                "         <papersType>" + paymentDto.getOwnerIdtype() + "</papersType>\n" +      //所属人证件类型
-                "         <papersNo>12312312-3</papersNo>\n" +                                   //所属人证件号
-                "         <nationality>0001</nationality>\n" +                                 //国籍
-                "         <account>" + paymentDto.getBankAccount() + "</account>\n" +      //银行账号
-                "         <bankCode>MRCCCNB1</bankCode>\n" +                            //开户行代码
-                "         <tel>" + paymentDto.getOwnerTel() + "</tel>\n" +                     //联系电话
+                "         <name>" + paymentDto.getOwnerName() + "</name>\n" +                   //商铺所属人姓名
+                "         <papersType>" + paymentDto.getOwnerIdtype() + "</papersType>\n" +     //所属人证件类型
+                "         <papersNo>" + paymentDto.getShopSccd() + "</papersNo>\n" +            //所属人证件号
+                "         <nationality>" + paymentDto.getNationality() + "</nationality>\n" +   //国籍
+                "         <account>" + paymentDto.getBankAccount() + "</account>\n" +           //银行账号
+                "         <bankCode>" + paymentDto.getBank() + "</bankCode>\n" +                //开户行代码
+                "         <tel>" + paymentDto.getOwnerTel() + "</tel>\n" +                      //联系电话
                 "</vendor>\n" +
                 "<items>\n" +
                 "         <name>" + paymentDto.getGoodsName() + "</name>\n" +                   //商品名称
                 "         <unit>" + paymentDto.getGoodsUnit() + "</unit>\n" +                   //商品单位
                 "         <price>" + paymentDto.getDeclPrice() + "</price>\n" +                 //商品单价
                 "         <quantity>" + paymentDto.getBuyQty() + "</quantity>\n" +              //商品数量
-                "         <weight>" + paymentDto.getGrossWt() + "</weight>\n" +                 //商品重量
+                "         <weight>" + paymentDto.getNetWt() + "</weight>\n" +                   //商品重量(净重)
                 "         <amount>" + paymentDto.getTotalPrice() + "</amount>\n" +              //金额
                 "</items>\n" +
                 "</payload>";
@@ -306,6 +314,7 @@ public class MessageXML {
                 CryptoUtil.encrypt(payload)+
                 "</plain>" +
                 "</message>";
+        StaticLog.info("\n --------发送报文--------SXB010--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -319,34 +328,35 @@ public class MessageXML {
                 "         <sn>" + paymentDto.getTradeNo() + "</sn>\n" +                         //订单号
                 "         <organization>" + paymentDto.getFieldCode() + "</organization>\n" +   //互市点机构代码
                 "         <currency>" + paymentDto.getCurrCode() + "</currency>\n" +            //币种
-                "         <type>02</type>\n" +                                              //业务类型	02代表退款报文
-                "         <charging>" + paymentDto.getResalePrice() + "</charging>\n" +         //计费金额(二级市场转售总金额)
+                "         <type>02</type>\n" +                                                  //业务类型	02代表退款报文
+                //"         <charging>" + paymentDto.getResalePrice() + "</charging>\n" +       //计费金额(二级市场转售总金额):charging送0
+                "         <charging>0</charging>\n" +                                           //一级市场订单还没有上架计费:charging送0
                 "         <total>" + paymentDto.getTotalPrice() + "</total>\n" +                //总金额8000.00(一级市场边民订单金额)
                 "         <date>" + paymentDto.getDeclTime() + "</date>\n" +                    //订单时间	YYYY-MM—DD HH：MM：DD SSS
                 "<vendee>\n" +
-                "         <name>" + paymentDto.getBorderName() + "</name>\n" +                 //边民姓名
-                "         <papersType>0001</papersType>\n" +                                 //证件类型  0001 身份证
-                "         <papersNo>" + paymentDto.getBorderidno() + "</papersNo>\n" +           //边民证件号
-                "         <nationality>0001</nationality>\n" +                             //国籍
-                "         <account>" + paymentDto.getBankCode() + "</account>\n" +         //银行账号
-                "         <bankCode>MRCCCNB1</bankCode>\n" +                            //开户行代码
-                "         <tel>" + paymentDto.getBorderTel() + "</tel>\n" +                    //联系电话
+                "         <name>" + paymentDto.getBorderName() + "</name>\n" +                  //边民姓名
+                "         <papersType>" + paymentDto.getPapersType() + "</papersType>\n" +      //证件类型  0001 身份证
+                "         <papersNo>" + paymentDto.getBorderidno() + "</papersNo>\n" +          //边民证件号
+                "         <nationality>" + paymentDto.getBorderNationality() + "</nationality>\n" +  //国籍
+                "         <account>" + paymentDto.getBankCode() + "</account>\n" +              //银行账号
+                "         <bankCode>" + paymentDto.getBankNo() + "</bankCode>\n" +              //开户行代码
+                "         <tel>" + paymentDto.getBorderTel() + "</tel>\n" +                     //联系电话
                 "</vendee>\n" +
                 "<vendor>\n" +
-                "         <name>" + paymentDto.getOwnerName() + "</name>\n" +                  //商铺所属人姓名
-                "         <papersType>" + paymentDto.getOwnerIdtype() + "</papersType>\n" +      //所属人证件类型
-                "         <papersNo>12312312-3</papersNo>\n" +                                   //所属人证件号
-                "         <nationality>0001</nationality>\n" +                                 //国籍
-                "         <account>" + paymentDto.getBankAccount() + "</account>\n" +      //银行账号
-                "         <bankCode>MRCCCNB1</bankCode>\n" +                            //开户行代码
-                "         <tel>" + paymentDto.getOwnerTel() + "</tel>\n" +                     //联系电话
+                "         <name>" + paymentDto.getOwnerName() + "</name>\n" +                   //商铺所属人姓名
+                "         <papersType>" + paymentDto.getOwnerIdtype() + "</papersType>\n" +     //所属人证件类型
+                "         <papersNo>" + paymentDto.getShopSccd() + "</papersNo>\n" +            //所属人证件号
+                "         <nationality>" + paymentDto.getNationality() + "</nationality>\n" +   //国籍
+                "         <account>" + paymentDto.getBankAccount() + "</account>\n" +           //银行账号
+                "         <bankCode>" + paymentDto.getBank() + "</bankCode>\n" +                //开户行代码
+                "         <tel>" + paymentDto.getOwnerTel() + "</tel>\n" +                      //联系电话
                 "</vendor>\n" +
                 "<items>\n" +
                 "         <name>" + paymentDto.getGoodsName() + "</name>\n" +                   //商品名称
                 "         <unit>" + paymentDto.getGoodsUnit() + "</unit>\n" +                   //商品单位
                 "         <price>" + paymentDto.getDeclPrice() + "</price>\n" +                 //商品单价
                 "         <quantity>" + paymentDto.getBuyQty() + "</quantity>\n" +              //商品数量
-                "         <weight>" + paymentDto.getGrossWt() + "</weight>\n" +                 //商品重量
+                "         <weight>" + paymentDto.getNetWt() + "</weight>\n" +                   //商品重量(净重)
                 "         <amount>" + paymentDto.getTotalPrice() + "</amount>\n" +              //金额
                 "</items>\n" +
                 "</payload>";
@@ -379,6 +389,7 @@ public class MessageXML {
                 CryptoUtil.encrypt(payload)+
                 "</plain>" +
                 "</message>";
+        StaticLog.info("\n --------发送报文--------SXB013--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -391,7 +402,7 @@ public class MessageXML {
                 "<payload xsi:type=\"carDTO\">" +
                 "<registration>" + paymentDto.getVoyageNo() + "</registration>\n" +  //车辆批号
                 "<plateNumber>" + paymentDto.getVeNo() + "</plateNumber>\n" +        //车牌号
-                "<Order>" + paymentDto.getTradeNo() + "</Order>\n" +//订单号	n个
+                "<Order>" + paymentDto.getTradeNos() + "</Order>\n" +//订单号	n个
                 "</payload>";
         String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
                 "<message xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:noNamespaceSchemaLocation=\"\">\n" +
@@ -421,6 +432,7 @@ public class MessageXML {
                 CryptoUtil.encrypt(payload)+
                 "</plain>" +
                 "</message>\n";
+        StaticLog.info("\n --------发送报文--------SXB023--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -453,6 +465,7 @@ public class MessageXML {
                 CryptoUtil.encrypt(payload)+
                 "</plain>" +
                 "</message>";
+        StaticLog.info("\n --------发送报文--------MKT002--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -465,7 +478,7 @@ public class MessageXML {
                 " <payload xsi:type=\"vendorDTO\"" +
                         " name=\"" + paymentTwoDto.getOwnerName() + "\"" +         //企业名称
                         " papersType=\"0008\"" +                                    //证件类型  0008 社会统一信用代码（默认）
-                        " papersNo=\"12312312-3\"" +                                //证件号
+                        " papersNo=\"78509372-8\"" +                                //证件号
                         " nationality=\"0001\"" +                                   //国籍
                         " accountNo=\"" + paymentTwoDto.getBankAccount() + "\"" +      //银行账号
                         " bankCode=\"MRCCCNB1\"" +                                  //开户行代码
@@ -484,6 +497,7 @@ public class MessageXML {
                 CryptoUtil.encrypt(payload)+
                 "</plain>" +
                 "</message>";
+        StaticLog.info("\n --------发送报文--------MKT004--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -491,26 +505,27 @@ public class MessageXML {
      * 订单扣款（无手续费）：二级市场--->银行
      */
     public static String MKT006_NoCommission(PaymentTwoDto paymentTwoDto) {
+        paymentTwoDto.setFieldCode("861501");
         String date = sdf.format(new Date());
         String payload=
                 "<payload xsi:type=\"orderDTO\"" +
                 " sn=\"" + paymentTwoDto.getOrderNo() + "\"" +                         //订单号
                 " organization=\"" + paymentTwoDto.getFieldCode() + "\"" +   //互市点机构代码
-                " currency=\"" + paymentTwoDto.getCurrCode() + "\"" +            //币种
+                " currency=\"RMB\"" +            //币种
                 " type=\"001\"" +                                                //业务类型	001 代表扣款订单
                 " total=\"" + paymentTwoDto.getResalePrice() + "\"" +               //订单总金额 8150.00 【买方总支付金额】(转售金额)
                 //" actualTotal=\"</actualTotal>\n" +                                     //扣除手续费边民实际到账金额  actualTotal忽略
-                " dateTime=\"" + paymentTwoDto.getDeclTime() + "\"" +            //订单时间	YYYY-MM—DD HH：MM：DD SSS
+                " dateTime=\"2024-01-17 10:11:55 876\"" +            //订单时间	YYYY-MM—DD HH：MM：DD SSS
                 ">" +
 
                 "<vendee" +//买方基本信息（采购企业）
-                " name=\"" + paymentTwoDto.getPcName() + "\"" +                       //企业名称
+                " name=\"云南跨境贸易公司\"" +                       //企业名称
                 " papersType=\"0008\"" +                                      //证件类型  0008 社会统一信用代码（默认）
-                " papersNo=\"" + paymentTwoDto.getBusinessLicense() + "\"" +        //证件号
+                " papersNo=\"12312312-3\"" +        //证件号
                 " nationality=\"0001\"" +                                  //国籍
-                " accountNo=\"" + paymentTwoDto.getPcBankAccount() + "\"" +     //银行账号
+                " accountNo=\"0100028613124012\"" +     //银行账号
                 " bankCode=\"MRCCCNB1\"" +                                   //开户行代码
-                " tel=\"" + paymentTwoDto.getPcContact() + "\"" +                     //联系电话
+                " tel=\"15195882701\"" +                     //联系电话
                 "/>\n" +
 
                 "<vendor" +//卖方基础信息（边民）
@@ -548,6 +563,7 @@ public class MessageXML {
                          CryptoUtil.encrypt(payload)+
                     "</plain>" +
                 "</message>";
+        StaticLog.info("\n --------发送报文--------MKT006(无计费)--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -555,6 +571,9 @@ public class MessageXML {
      * 订单扣款（+手续费）：二级市场--->银行
      */
     public static String MKT006(PaymentTwoDto paymentTwoDto) {
+        paymentTwoDto.setFieldCode("861501");
+        paymentTwoDto.setDeclTime("2024-01-17 10:11:55 876");
+        paymentTwoDto.setCurrCode("RMB");
         String date = sdf.format(new Date());
         String chargesXml = chargesXml(paymentTwoDto.getCompanyDtoList(), paymentTwoDto.getOrderNo());
         String payload=
@@ -564,11 +583,11 @@ public class MessageXML {
                 " currency=\"" + paymentTwoDto.getCurrCode() + "\"" +            //币种
                 " type=\"001\"" +                                                //业务类型	001 代表扣款订单
                 " total=\"" + paymentTwoDto.getResalePrice() + "\"" +               //订单总金额 8150.00 【买方总支付金额】(转售金额)
-                " actualTotal=\"" + paymentTwoDto.getTotalPrice() + "\"" +      //扣除手续费边民实际到账金额  actualTotal忽略
+                " actualTotal=\"7490.05\"" +      //扣除手续费边民实际到账金额  actualTotal忽略
                 " dateTime=\"" + paymentTwoDto.getDeclTime() + "\"" +            //订单时间	YYYY-MM—DD HH：MM：DD SSS
                 ">" +
 
-                "<vendee" +//买方基本信息（采购企业）
+                /*"<vendee" +//买方基本信息（采购企业）
                 " name=\"" + paymentTwoDto.getPcName() + "\"" +                       //企业名称
                 " papersType=\"0008\"" +                                      //证件类型  0008 社会统一信用代码（默认）
                 " papersNo=\"" + paymentTwoDto.getBusinessLicense() + "\"" +        //证件号
@@ -576,6 +595,15 @@ public class MessageXML {
                 " accountNo=\"" + paymentTwoDto.getPcBankAccount() + "\"" +     //银行账号
                 " bankCode=\"MRCCCNB1\"" +                                   //开户行代码
                 " tel=\"" + paymentTwoDto.getPcContact() + "\"" +                     //联系电话
+                "/>\n" +*/
+                "<vendee" +//买方基本信息（采购企业）
+                " name=\"云南跨境贸易公司\"" +                       //企业名称
+                " papersType=\"0008\"" +                                      //证件类型  0008 社会统一信用代码（默认）
+                " papersNo=\"12312312-3\"" +        //证件号
+                " nationality=\"0001\"" +                                  //国籍
+                " accountNo=\"0100028613124012\"" +     //银行账号
+                " bankCode=\"MRCCCNB1\"" +                                   //开户行代码
+                " tel=\"15195882701\"" +                     //联系电话
                 "/>\n" +
 
                 "<vendor" +//卖方基础信息（边民）
@@ -613,6 +641,7 @@ public class MessageXML {
                         CryptoUtil.encrypt(payload)+
                     "</plain>" +
                 "</message>";
+        StaticLog.info("\n --------发送报文--------MKT006(有计费)--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -632,7 +661,8 @@ public class MessageXML {
                         " dateTime=\"" + paymentTwoDto.getDeclTime() + "\"" +            //订单时间	YYYY-MM—DD HH：MM：DD SSS
                         ">" +
 
-                        "<vendee" +//买方基本信息（采购企业）
+
+                        /*"<vendee" +//买方基本信息（采购企业）
                         " name=\"" + paymentTwoDto.getPcName() + "\"" +                       //企业名称
                         " papersType=\"0008\"" +                                      //证件类型  0008 社会统一信用代码（默认）
                         " papersNo=\"" + paymentTwoDto.getBusinessLicense() + "\"" +        //证件号
@@ -650,6 +680,26 @@ public class MessageXML {
                         " accountNo=\"" + paymentTwoDto.getBankCode() + "\"" +        //银行账号
                         " bankCode=\"MRCCCNB1\"" +                                 //开户行代码
                         " tel=\"" + paymentTwoDto.getBorderTel() + "\"" +                   //联系电话
+                        "/>\n" +*/
+
+                        "<vendee" +//买方基本信息（采购企业）
+                        " name=\"云南跨境贸易公司\"" +                       //企业名称
+                        " papersType=\"0008\"" +                           //证件类型  0008 社会统一信用代码（默认）
+                        " papersNo=\"12312312-3\"" +                       //证件号
+                        " nationality=\"0001\"" +                          //国籍
+                        " accountNo=\"0100028613124012\"" +                //银行账号
+                        " bankCode=\"MRCCCNB1\"" +                         //开户行代码
+                        " tel=\"15195882701\"" +                           //联系电话
+                        "/>\n" +
+
+                        "<vendor" +//卖方基础信息（边民）
+                        " name=\"" + paymentTwoDto.getBorderName() + "\"" +                 //边民姓名
+                        " papersType=\"0001\"" +                                    //证件类型  0001 身份证
+                        " papersNo=\"" + paymentTwoDto.getBorderidno() + "\"" +           //边民证件号
+                        " nationality=\"0001\"" +                                //国籍
+                        " accountNo=\"" + paymentTwoDto.getBankCode() + "\"" +        //银行账号
+                        " bankCode=\"MRCCCNB1\"" +                                 //开户行代码
+                        " tel=\"" + paymentTwoDto.getBorderTel() + "\"" +                   //联系电话
                         "/>\n" +
 
                         "<items" +//商品明细
@@ -662,6 +712,7 @@ public class MessageXML {
                         " amount=\"" + paymentTwoDto.getTotalPrice() + "\"" +              //金额
                         "/>\n" +
                         "</payload>";
+
         String xml =
                 "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n" +
                         "<message xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" xsi:schemaLocation=\"\">\n" +
@@ -676,6 +727,7 @@ public class MessageXML {
                         CryptoUtil.encrypt(payload)+
                         "</plain>" +
                         "</message>";
+        StaticLog.info("\n --------发送报文--------MKT007--------" + "\n payload=" + payload +"\n xml=" + xml);
         return xml;
     }
 
@@ -683,6 +735,10 @@ public class MessageXML {
     private static String chargesXml(List<CompanyDto> companyDtoList, String orderNo) {
         String xml = "";
         for (CompanyDto companyDto : companyDtoList) {
+            companyDto.setName("云南跨境贸易公司");
+            companyDto.setUsci("12312312-3");
+            companyDto.setBankAccount("0100028613124012");
+            companyDto.setContact("15195882701");
             xml += "<charges" +//父级手续费(无子级手续费）
                     " type=\"OPERATING\"" +                                     //手续费类型	数据字典：ChargeType
                     " sn=\"" + orderNo + "\"" +                                 //订单号