银行报文修改

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

@@ -205,6 +205,8 @@ public class PaymentDto implements Serializable {
 	//商铺联系电话
 	private String ownerTel;
 
+	//商品编码
+	private String codeTs;
 	//商品名称
 	private String goodsName;
 	//商品单位
@@ -268,6 +270,14 @@ public class PaymentDto implements Serializable {
 		this.ownerTel = ownerTel;
 	}
 
+	public String getCodeTs() {
+		return codeTs;
+	}
+
+	public void setCodeTs(String codeTs) {
+		this.codeTs = codeTs;
+	}
+
 	public String getGoodsName() {
 		return goodsName;
 	}

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

@@ -177,14 +177,17 @@ public class PaymentTwoDto 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;
 
@@ -213,6 +216,8 @@ public class PaymentTwoDto implements Serializable {
 	private Double buyQty;
 	//商品重量(毛重)
 	private Double grossWt;
+	//商品重量(净重)
+	private Double netWt;
 
 	private String tradeNos;
 
@@ -222,17 +227,29 @@ public class PaymentTwoDto implements Serializable {
 	 */
 	private String pcName;
 	/**
-	 * 营业执照
+	 * 统一社会信用代码
 	 */
-	private String businessLicense;
+	private String dutyParagraph;
 	/**
 	 * 银行账号
 	 */
 	private String pcBankAccount;
 	/**
+	 * 银行代码
+	 */
+	private String pcBankNo;
+	/**
 	 * 手机号码
 	 */
 	private String pcContact;
+	/**
+	 * 身份证号
+	 */
+	private String pcIdCard;
+	/**
+	 * 采购商类型
+	 */
+	private Integer pcType;
 
 	//费项列表
 	private List<CompanyDto> companyDtoList;
@@ -253,12 +270,20 @@ public class PaymentTwoDto implements Serializable {
 		this.pcName = pcName;
 	}
 
-	public String getBusinessLicense() {
-		return businessLicense;
+	public String getDutyParagraph() {
+		return dutyParagraph;
+	}
+
+	public void setDutyParagraph(String dutyParagraph) {
+		this.dutyParagraph = dutyParagraph;
 	}
 
-	public void setBusinessLicense(String businessLicense) {
-		this.businessLicense = businessLicense;
+	public String getPcBankNo() {
+		return pcBankNo;
+	}
+
+	public void setPcBankNo(String pcBankNo) {
+		this.pcBankNo = pcBankNo;
 	}
 
 	public String getPcBankAccount() {
@@ -277,6 +302,22 @@ public class PaymentTwoDto implements Serializable {
 		this.pcContact = pcContact;
 	}
 
+	public String getPcIdCard() {
+		return pcIdCard;
+	}
+
+	public void setPcIdCard(String pcIdCard) {
+		this.pcIdCard = pcIdCard;
+	}
+
+	public Integer getPcType() {
+		return pcType;
+	}
+
+	public void setPcType(Integer pcType) {
+		this.pcType = pcType;
+	}
+
 	public String getTradeNos() {
 		return tradeNos;
 	}
@@ -373,6 +414,14 @@ public class PaymentTwoDto implements Serializable {
 		this.grossWt = grossWt;
 	}
 
+	public Double getNetWt() {
+		return netWt;
+	}
+
+	public void setNetWt(Double netWt) {
+		this.netWt = netWt;
+	}
+
 	public String getBorderName() {
 		return borderName;
 	}
@@ -389,6 +438,30 @@ public class PaymentTwoDto 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 getBankNo() {
+		return bankNo;
+	}
+
+	public void setBankNo(String bankNo) {
+		this.bankNo = bankNo;
+	}
+
 	public String getBankCode() {
 		return bankCode;
 	}

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

@@ -457,6 +457,22 @@ public class PeopleDto {
         this.fieldCode = fieldCode;
     }
 
+    public String getPapersType() {
+        return papersType;
+    }
+
+    public void setPapersType(String papersType) {
+        this.papersType = papersType;
+    }
+
+    public String getNationality() {
+        return nationality;
+    }
+
+    public void setNationality(String nationality) {
+        this.nationality = nationality;
+    }
+
     private Long id;
 
     /**
@@ -701,7 +717,10 @@ public class PeopleDto {
      */
     private String fieldCode;
 
-
+    //证件类型
+    private String papersType;
+    //国籍
+    private String nationality;
 
 
 

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

@@ -447,6 +447,7 @@ public class TbOrderService extends ServiceImpl<TbOrderMapper, TbOrder> implemen
         BeanUtils.copyProperties(htTradeSettlement, paymentDto);
 
         paymentDto.setTradeNo(tbOrder.getTradeNo());
+        paymentDto.setCodeTs(tbOrder.getCodeTs());
         paymentDto.setBuyQty(tbOrder.getBuyQty());
         paymentDto.setGrossWt(tbOrder.getGrossWt());
         paymentDto.setNetWt(tbOrder.getNetWt());

sp-service/level-two-server/src/main/java/com/pj/tb_orders/TbOrdersService.java

@@ -128,28 +128,43 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
         PaymentTwoDto paymentTwoDto = new PaymentTwoDto();
         BeanUtils.copyProperties(htTradeSettlement, paymentTwoDto);
 
+        //二级市场订单号
         paymentTwoDto.setOrderNo(t.getOrderNo());
+        //转售金额
+        paymentTwoDto.setResalePrice(BigDecimal.valueOf(t.getResalePrice()));
+        //商品信息
         paymentTwoDto.setBuyQty(orderOne.getBuyQty());
         paymentTwoDto.setGrossWt(orderOne.getGrossWt());
+        paymentTwoDto.setNetWt(orderOne.getNetWt());
         paymentTwoDto.setGoodsName(orderOne.getGoodsNames());
         paymentTwoDto.setGoodsUnit(orderOne.getGoodsUnit());
         paymentTwoDto.setDeclPrice(orderOne.getDeclPrice());
         paymentTwoDto.setCodeTs(orderOne.getCodeTs());
-        //转售金额
-        paymentTwoDto.setResalePrice(BigDecimal.valueOf(t.getResalePrice()));
 
         PeopleDto tbPeople = levelOneServerInterface.getRpcById(orderOne.getBuyUserId());
-        paymentTwoDto.setBankCode(tbPeople.getBankCode());
-        paymentTwoDto.setBankName(tbPeople.getBankName());
-        paymentTwoDto.setBorderName(tbPeople.getName());
-        paymentTwoDto.setBorderidno(tbPeople.getIdCard());
-        paymentTwoDto.setBorderTel(tbPeople.getPhone());
+        StaticLog.info("边民tbPeople:{}", JSONUtil.toJsonStr(tbPeople));
+        if (tbPeople != null) {
+            paymentTwoDto.setBankCode(tbPeople.getBankCode());
+            paymentTwoDto.setBankName(tbPeople.getBankName());
+            paymentTwoDto.setBankNo(tbPeople.getBankNo());
+            paymentTwoDto.setBorderName(tbPeople.getName());
+            paymentTwoDto.setBorderidno(tbPeople.getIdCard());
+            paymentTwoDto.setBorderTel(tbPeople.getPhone());
+            paymentTwoDto.setPapersType(tbPeople.getPapersType());
+            paymentTwoDto.setBorderNationality(tbPeople.getNationality());
+        }
 
         TbPurchaser purchaser = tbPurchaserMapper.selectById(t.getPurchaserId());
-        paymentTwoDto.setPcName(purchaser.getName());
-        paymentTwoDto.setBusinessLicense(purchaser.getBusinessLicense());
-        paymentTwoDto.setPcBankAccount(purchaser.getBankAccount());
-        paymentTwoDto.setPcContact(purchaser.getContact());
+        StaticLog.info("采购商purchaser:{}", JSONUtil.toJsonStr(purchaser));
+        if (purchaser != null) {
+            paymentTwoDto.setPcName(purchaser.getName());
+            paymentTwoDto.setDutyParagraph(purchaser.getDutyParagraph());
+            paymentTwoDto.setPcBankAccount(purchaser.getBankAccount());
+            paymentTwoDto.setPcBankNo(purchaser.getBankNo());
+            paymentTwoDto.setPcContact(purchaser.getContact());
+            paymentTwoDto.setPcIdCard(purchaser.getIdCard());
+            paymentTwoDto.setPcType(purchaser.getType());
+        }
 
         return paymentTwoDto;
     }
@@ -227,16 +242,16 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
             //todo 1、订单状态更新
             orderTwo.setIsPay(1);
             orderTwo.setPayTime(new Date());
-
-            orderTwo.setPayTax(3);//缴费中
-            orderTwo.setPayTaxTime(new Date());//缴费时间
+            orderTwo.setOrderFinish(1);//支付成功订单完成
+            //orderTwo.setPayTax(3);//缴费中
+            //orderTwo.setPayTaxTime(new Date());//缴费时间
             //todo 2、同步订单信息，发送航通
             /*OrdersDto ordersDto = new OrdersDto();
             BeanUtils.copyProperties(orderTwo, ordersDto);
             asyncServerInterface.sendLevelTwoOrdersDto(ordersDto, DataType.DATA_TYPE_FOUR.getCode());*/
 
             //todo 3、系统将服务费自动分账，将分账信息自动发送至银行进行划扣
-            List<TbItemRules> ruleList = new ArrayList<>();
+            /*List<TbItemRules> ruleList = new ArrayList<>();
             List<TbFeeItem> feeItemList = tbFeeItemService.getFeeItems();
             feeItemList.forEach(feeItem -> {
                 ruleList.addAll(tbItemRulesService.getList(new SoMap().set("itemId", feeItem.getId())));
@@ -270,7 +285,7 @@ public class TbOrdersService extends ServiceImpl<TbOrdersMapper, TbOrders> imple
 
             PaymentTwoDto paymentTwoDto = this.getPaymentData(orderTwo, orderOne);
             paymentTwoDto.setCompanyDtoList(companyDtoList);
-            paymentServerInterface.sendMKT006(paymentTwoDto);
+            paymentServerInterface.sendMKT006(paymentTwoDto);*/
         }
 
         return updateById(orderTwo);

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

@@ -83,7 +83,7 @@ public class PaymentService {
         paymentDto.setOrderNo("EJSCDD2408261611120098");
         paymentDto.setResalePrice(BigDecimal.valueOf(8450.05));
         paymentDto.setPcName("云南跨境贸易公司");
-        paymentDto.setBusinessLicense("12312312-3");
+        paymentDto.setDutyParagraph("12312312-3");
         paymentDto.setPcBankAccount("0100028613124012");
         paymentDto.setPcContact("15195882701");
 

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

@@ -20,6 +20,7 @@ public class MessageXML {
      * 结关报文：海关数据中心--->银行
      */
     public static String CXB001(PaymentDto paymentDto) {
+        paymentDto.setFieldCode("861501");
         String date = sdf.format(new Date());
         String payload =
                 "<payload xsi:type=\"responseDTO\">\n" +
@@ -247,6 +248,7 @@ public class MessageXML {
      * 订单扣款：一级市场--->银行
      */
     public static String SXB010(PaymentDto paymentDto) {
+        paymentDto.setFieldCode("861501");
         String date = sdf.format(new Date());
         String payload =
                 "<payload xsi:type=\"orderDTO\">" +
@@ -267,8 +269,12 @@ public class MessageXML {
                 "         <account>" + paymentDto.getBankCode() + "</account>\n" +              //银行账号
                 "         <bankCode>" + paymentDto.getBankNo() + "</bankCode>\n" +              //开户行代码
                 "         <tel>" + paymentDto.getBorderTel() + "</tel>\n" +                     //联系电话
+                "         <enAddress></enAddress>\n" +
+                "         <bankSignTime></bankSignTime>\n" +
                 "</vendee>\n" +
                 "<vendor>\n" +
+                "         <title></title>\n" +
+                "         <enTitle></enTitle>\n" +
                 "         <name>" + paymentDto.getOwnerName() + "</name>\n" +                   //商铺所属人姓名
                 "         <papersType>" + paymentDto.getOwnerIdtype() + "</papersType>\n" +     //所属人证件类型
                 "         <papersNo>" + paymentDto.getShopSccd() + "</papersNo>\n" +            //所属人证件号
@@ -276,8 +282,12 @@ public class MessageXML {
                 "         <account>" + paymentDto.getBankAccount() + "</account>\n" +           //银行账号
                 "         <bankCode>" + paymentDto.getBank() + "</bankCode>\n" +                //开户行代码
                 "         <tel>" + paymentDto.getOwnerTel() + "</tel>\n" +                      //联系电话
+                "         <address></address>\n" +
+                "         <enAddress></enAddress>\n" +
+                "         <abroad></abroad>\n" +
                 "</vendor>\n" +
                 "<items>\n" +
+                "         <code>" + paymentDto.getCodeTs() + "</code>\n" +                      //商品编码
                 "         <name>" + paymentDto.getGoodsName() + "</name>\n" +                   //商品名称
                 "         <unit>" + paymentDto.getGoodsUnit() + "</unit>\n" +                   //商品单位
                 "         <price>" + paymentDto.getDeclPrice() + "</price>\n" +                 //商品单价
@@ -322,6 +332,7 @@ public class MessageXML {
      * 订单退款：一级市场--->银行
      */
     public static String SXB013(PaymentDto paymentDto) {
+        paymentDto.setFieldCode("861501");
         String date = sdf.format(new Date());
         String payload =
                 "<payload xsi:type=\"orderDTO\">" +
@@ -341,8 +352,12 @@ public class MessageXML {
                 "         <account>" + paymentDto.getBankCode() + "</account>\n" +              //银行账号
                 "         <bankCode>" + paymentDto.getBankNo() + "</bankCode>\n" +              //开户行代码
                 "         <tel>" + paymentDto.getBorderTel() + "</tel>\n" +                     //联系电话
+                "         <enAddress></enAddress>\n" +
+                "         <bankSignTime></bankSignTime>\n" +
                 "</vendee>\n" +
                 "<vendor>\n" +
+                "         <title></title>\n" +
+                "         <enTitle></enTitle>\n" +
                 "         <name>" + paymentDto.getOwnerName() + "</name>\n" +                   //商铺所属人姓名
                 "         <papersType>" + paymentDto.getOwnerIdtype() + "</papersType>\n" +     //所属人证件类型
                 "         <papersNo>" + paymentDto.getShopSccd() + "</papersNo>\n" +            //所属人证件号
@@ -350,8 +365,12 @@ public class MessageXML {
                 "         <account>" + paymentDto.getBankAccount() + "</account>\n" +           //银行账号
                 "         <bankCode>" + paymentDto.getBank() + "</bankCode>\n" +                //开户行代码
                 "         <tel>" + paymentDto.getOwnerTel() + "</tel>\n" +                      //联系电话
+                "         <address></address>\n" +
+                "         <enAddress></enAddress>\n" +
+                "         <abroad></abroad>\n" +
                 "</vendor>\n" +
                 "<items>\n" +
+                "         <code>" + paymentDto.getCodeTs() + "</code>\n" +                      //商品编码
                 "         <name>" + paymentDto.getGoodsName() + "</name>\n" +                   //商品名称
                 "         <unit>" + paymentDto.getGoodsUnit() + "</unit>\n" +                   //商品单位
                 "         <price>" + paymentDto.getDeclPrice() + "</price>\n" +                 //商品单价
@@ -397,9 +416,10 @@ public class MessageXML {
      * 通关车批信息同步(车出一级市场时)：一级市场--->银行
      */
     public static String SXB023(PaymentDto paymentDto) {
+        paymentDto.setFieldCode("861501");
         String date = sdf.format(new Date());
         String payload=
-                "<payload xsi:type=\"carDTO\">" +
+                "<payload xsi:type=\"carpoolDTO\">" +
                 "<registration>" + paymentDto.getVoyageNo() + "</registration>\n" +  //车辆批号
                 "<plateNumber>" + paymentDto.getVeNo() + "</plateNumber>\n" +        //车牌号
                 "<Order>" + paymentDto.getTradeNos() + "</Order>\n" +//订单号	n个
@@ -507,45 +527,57 @@ public class MessageXML {
     public static String MKT006_NoCommission(PaymentTwoDto paymentTwoDto) {
         paymentTwoDto.setFieldCode("861501");
         String date = sdf.format(new Date());
+        String purchaserXml = "<vendee" +//买方基本信息（采购企业）
+                " name=\"" + paymentTwoDto.getPcName() + "\"" +                 //企业名称
+                " papersType=\"0008\"" +                                        //证件类型  0008 社会统一信用代码（默认）
+                " papersNo=\"" + paymentTwoDto.getDutyParagraph() + "\"" +      //证件号
+                " nationality=\"0001\"" +                                       //国籍
+                " accountNo=\"" + paymentTwoDto.getPcBankAccount() + "\"" +     //银行账号
+                " bankCode=\"" + paymentTwoDto.getPcBankNo() + "\"" +           //开户行代码
+                " tel=\"" + paymentTwoDto.getPcContact() + "\"" +               //联系电话
+                "/>\n";
+        if(paymentTwoDto.getPcType() == 2) {
+            purchaserXml = "<vendee" +//买方基本信息（个人采购商）
+                    " name=\"" + paymentTwoDto.getPcName() + "\"" +                 //企业名称
+                    " papersType=\"0001\"" +                                        //证件类型  0001 身份证
+                    " papersNo=\"" + paymentTwoDto.getPcIdCard() + "\"" +           //证件号
+                    " nationality=\"0001\"" +                                       //国籍
+                    " accountNo=\"" + paymentTwoDto.getPcBankAccount() + "\"" +     //银行账号
+                    " bankCode=\"" + paymentTwoDto.getPcBankNo() + "\"" +           //开户行代码
+                    " tel=\"" + paymentTwoDto.getPcContact() + "\"" +               //联系电话
+                    "/>\n";
+        }
         String payload=
                 "<payload xsi:type=\"orderDTO\"" +
-                " sn=\"" + paymentTwoDto.getOrderNo() + "\"" +                         //订单号
-                " organization=\"" + paymentTwoDto.getFieldCode() + "\"" +   //互市点机构代码
-                " currency=\"RMB\"" +            //币种
-                " type=\"001\"" +                                                //业务类型	001 代表扣款订单
-                " total=\"" + paymentTwoDto.getResalePrice() + "\"" +               //订单总金额 8150.00 【买方总支付金额】(转售金额)
-                //" actualTotal=\"</actualTotal>\n" +                                     //扣除手续费边民实际到账金额  actualTotal忽略
-                " dateTime=\"2024-01-17 10:11:55 876\"" +            //订单时间	YYYY-MM—DD HH：MM：DD SSS
+                " sn=\"" + paymentTwoDto.getOrderNo() + "\"" +                  //订单号
+                " organization=\"" + paymentTwoDto.getFieldCode() + "\"" +      //互市点机构代码
+                " currency=\"RMB\"" +                                           //币种
+                " type=\"001\"" +                                               //业务类型	001 代表扣款订单
+                " total=\"" + paymentTwoDto.getResalePrice() + "\"" +           //订单总金额 8150.00 【买方总支付金额】(转售金额)
+                //" actualTotal=\"</actualTotal>\n" +                           //扣除手续费边民实际到账金额  actualTotal忽略
+                " dateTime=\"" + date + "\"" +                                  //订单时间	YYYY-MM—DD HH：MM：DD SSS
                 ">" +
 
-                "<vendee" +//买方基本信息（采购企业）
-                " name=\"云南跨境贸易公司\"" +                       //企业名称
-                " papersType=\"0008\"" +                                      //证件类型  0008 社会统一信用代码（默认）
-                " papersNo=\"12312312-3\"" +        //证件号
-                " nationality=\"0001\"" +                                  //国籍
-                " accountNo=\"0100028613124012\"" +     //银行账号
-                " bankCode=\"MRCCCNB1\"" +                                   //开户行代码
-                " tel=\"15195882701\"" +                     //联系电话
-                "/>\n" +
+                purchaserXml +
 
                 "<vendor" +//卖方基础信息（边民）
-                " name=\"" + paymentTwoDto.getBorderName() + "\"" +                 //边民姓名
-                " papersType=\"0001\"" +                                    //证件类型  0001 身份证
-                " papersNo=\"" + paymentTwoDto.getBorderidno() + "\"" +           //边民证件号
-                " nationality=\"0001\"" +                                //国籍
-                " accountNo=\"" + paymentTwoDto.getBankCode() + "\"" +        //银行账号
-                " bankCode=\"MRCCCNB1\"" +                                 //开户行代码
-                " tel=\"" + paymentTwoDto.getBorderTel() + "\"" +                   //联系电话
+                " name=\"" + paymentTwoDto.getBorderName() + "\"" +             //边民姓名
+                " papersType=\"" + paymentTwoDto.getPapersType() + "\"" +       //证件类型  0001 身份证
+                " papersNo=\"" + paymentTwoDto.getBorderidno() + "\"" +         //边民证件号
+                " nationality=\"" + paymentTwoDto.getBorderNationality() + "\"" +  //国籍
+                " accountNo=\"" + paymentTwoDto.getBankCode() + "\"" +          //银行账号
+                " bankCode=\"" + paymentTwoDto.getBankNo() + "\"" +             //开户行代码
+                " tel=\"" + paymentTwoDto.getBorderTel() + "\"" +               //联系电话
                 "/>\n" +
 
                 "<items" +//商品明细
-                " code=\"" + paymentTwoDto.getCodeTs() + "\"" +                      //商品编码
-                " name=\"" + paymentTwoDto.getGoodsName() + "\"" +                   //商品名称
-                " unit=\"" + paymentTwoDto.getGoodsUnit() + "\"" +                   //商品单位
-                " price=\"" + paymentTwoDto.getDeclPrice() + "\"" +                 //商品单价
-                " quantity=\"" + paymentTwoDto.getBuyQty() + "\"" +              //商品数量
-                " weight=\"" + paymentTwoDto.getGrossWt() + "\"" +                 //商品重量
-                " amount=\"" + paymentTwoDto.getTotalPrice() + "\"" +              //金额
+                " code=\"" + paymentTwoDto.getCodeTs() + "\"" +             //商品编码
+                " name=\"" + paymentTwoDto.getGoodsName() + "\"" +          //商品名称
+                " unit=\"" + paymentTwoDto.getGoodsUnit() + "\"" +          //商品单位
+                " price=\"" + paymentTwoDto.getDeclPrice() + "\"" +         //商品单价
+                " quantity=\"" + paymentTwoDto.getBuyQty() + "\"" +         //商品数量
+                " weight=\"" + paymentTwoDto.getNetWt() + "\"" +            //商品重量
+                " amount=\"0\"" +                                           //金额
                 "/>\n" +
 
                 "</payload>";
@@ -567,6 +599,7 @@ public class MessageXML {
         return xml;
     }
 
+
     /**
      * 订单扣款（+手续费）：二级市场--->银行
      */
@@ -731,7 +764,6 @@ public class MessageXML {
         return xml;
     }
 
-
     private static String chargesXml(List<CompanyDto> companyDtoList, String orderNo) {
         String xml = "";
         for (CompanyDto companyDto : companyDtoList) {
@@ -756,10 +788,5 @@ public class MessageXML {
         return xml;
     }
 
-    public static void main(String[] args) {
-        SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss sss");
-        Date day = new Date();
-        String format = sdf.format(day);
-        System.out.println(UUID.randomUUID());
-    }
+
 }