重汽控制台拆分

jianshui-admin/src/main/resources/application-dev.yml

@@ -9,11 +9,13 @@ spring:
     druid:
       # 主库数据源
       master:
-        url: jdbc:mysql://81.70.100.158:3306/jianshui_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+#        url: jdbc:mysql://81.70.100.158:3306/jianshui_dev?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
+        url: jdbc:mysql://58.87.71.213:3306/bid_jianshui?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
 #        url: jdbc:mysql://58.87.71.213:3306/jianshui_dev_new?useUnicode=true&characterEncoding=utf8&zeroDateTimeBehavior=convertToNull&useSSL=true&serverTimezone=GMT%2B8
-        username: jianshui_dev
-#        username: jianshui_dev_new
-        password: tHsWetXEjYFJsdAC
+#        username: jianshui_dev
+        username: bid_jianshui
+#        password: tHsWetXEjYFJsdAC
+        password: ts3D5zYkFzcxbrPc
 #        password: kaMSddCzO54qtIg0I9N8iKA2iSFrm8YdBK55Zxdjxy8Zuo7+GoRcZHUOI9UmY1JtrMP6wA//Bftj8oq8zRbbPA==
           # 从库数据源
       slave:

jianshui-common/src/main/java/com/jianshui/common/constant/WebServiceConstant.java

@@ -12,7 +12,9 @@ public class WebServiceConstant {
     // TODO: 2022/12/13 不能进行测试，先不放上了，别误操作调用了
     // TODO: 2023/1/12 所有的接口都用慧永的
 
-    public final static String URL = "https://rocgw.jcsk100.com/external/api";
+//    public final static String URL = "https://rocgw.jcsk100.com/external/api";
+//  新接口地址 10.29之后原地址将废弃。
+    public final static String URL = "https://roc.jcsk100.com/external/api";
 
     public final static String TOKEN_KEY = "JCSK_YHDJ_";
 

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/BillInfo.java

@@ -390,6 +390,22 @@ public class BillInfo extends BaseEntity
     private List<Jzfwxx> jzfwList; // 建筑服务信息
 
 
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     public List<Fjys> getFjysList() {
         return fjysList;
     }

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDTO.java

@@ -28,6 +28,13 @@ public class AisinoConsoleInvoiceAddDTO {
     @Alias("buyerName")
     private String customerName;
 
+    /**
+     * 机动车-购方名称
+     */
+    @NotEmpty
+    @Alias("buyerName")
+    private String infoClientName;
+
     /**
      * 购方税号
      */
@@ -106,6 +113,58 @@ public class AisinoConsoleInvoiceAddDTO {
      */
     private Double quantity;
 
+    // 机动车发票开具新增字段start
+
+    /** 身份证号码/组织机 构代码*/
+    private String IDCard;
+
+    /** 车辆类型*/
+    private String vehicleKind;
+    /** 厂牌型号*/
+    private String brandModel;
+    /** 产地*/
+    private String originPlace;
+    /** 合格证号*/
+    private String qualityCertificate;
+    /** 进口证明书号*/
+    private String impCertificateNo;
+    /** 商检单号*/
+    private String commInspectionNo;
+    /** 发动机号*/
+    private String vehicleNo;
+    /** 生产企业名称*/
+    private String ManufacturerName;
+    /** 价税合计*/
+    private String amountTaxTotal;
+    /** 销货单位 电话*/
+    private String sellerPhone;
+    /** 销货单位 账号*/
+    private String sellerAccount;
+    /** 销货单位 地址*/
+    private String sellerAddress;
+    /** 销货单位 开户银行*/
+    private String sellerBank;
+    /** 税率*/
+    private String infoTaxRate;
+    /** 吨位*/
+    private String tonnage;
+    /** 限乘人数*/
+    private String peopleNo;
+    /** 备注*/
+    private String infoNotes;
+    /** 单据编号*/
+//    private String documentNr;
+    /** 开票人*/
+    private String infoInvoicer;
+    /** 机动车发票票面版式标志*/
+    private String InfoClientAddressPhone;
+    /** 机动车蓝字发票开具时间*/
+    private String JDCBlueInvKJSJ;
+    /** 填开、校验、空白作废标志*/
+//    private String CheckEWM;
+
+    // end
+
 
 
     /**

jianshui-invoice/src/main/java/com/jianshui/invoice/domain/dto/api/aisino/console/AisinoConsoleInvoiceAddDetailDTO.java

@@ -97,5 +97,21 @@ public class AisinoConsoleInvoiceAddDetailDTO {
     @Alias("kce")
     private String TaxDeduction;
 
+    // 机动车开具接口 start
+    /** 税收分类编码版本号*/
+//    private String TaxDeduction;
+//    /** 税收分类编码*/
+//    private String GoodsTaxNo;
+//    /** 是否享受优惠政策*/
+//    private String TaxPre;
+//    /** 优惠政策*/
+//    private String TaxPreCon;
+//    /** 零税率标识*/
+//    private String ZeroTax;
+//    /** 车辆企业自编码*/
+//    private String CropGoodsNo;
+
+    // end
+
 
 }

jianshui-invoice/src/main/java/com/jianshui/invoice/service/impl/api/AisinoConsoleInvoiceApiServiceImpl.java

@@ -85,10 +85,10 @@ public class AisinoConsoleInvoiceApiServiceImpl implements IInvoiceApiService {
         if (StrUtil.isEmpty(outNO)) {
             return new HXResponse("订单号为空，请检查报文！");
         }
-        BillInfo billInfoValidate = billInfoMapper.selectByOutTradeOrderno(companyservice.getCompanyid(), outNO);
+        /*BillInfo billInfoValidate = billInfoMapper.selectByOutTradeOrderno(companyservice.getCompanyid(), outNO);
         if (BeanUtil.isNotEmpty(billInfoValidate)) {
             return new HXResponse("订单号不允许重复！！！");
-        }
+        }*/
         // end
 
         // 预处理：处理billinfo，计算税额等