diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java index b823a723..7446dcef 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerEntity.java @@ -140,4 +140,9 @@ public class BuyerEntity implements Serializable { private String entId; private String deptId; + + /** + * 开票是否校验银行账号信息 0否 1是 + */ + private String checkBankFlag; } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcel.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcel.java index e28a2658..502fe583 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcel.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcel.java @@ -66,4 +66,9 @@ public class BuyerImportExcel { private String ghfSjh; private String khzt; + /** + * 开票是否校验银行账号信息 0否 1是 + */ + private String checkBankFlag; + } diff --git a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcelEnum.java b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcelEnum.java index fe7e487a..438d553e 100644 --- a/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcelEnum.java +++ b/order-management-base-service/src/main/java/com/dxhy/order/baseservice/module/buyer/model/BuyerImportExcelEnum.java @@ -75,6 +75,11 @@ public enum BuyerImportExcelEnum { // private String status; KH_ZT("客户状态", BuyerImportExcel.class.getDeclaredFields()[10].getName()), + /** + * 开票是否校验银行账号信息 0否 1是 + */ + CHECK_BANK_FLAG("开票是否校验银行账号信息", BuyerImportExcel.class.getDeclaredFields()[11].getName()), + ; diff --git a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml index ab704b04..df9a1026 100644 --- a/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml +++ b/order-management-base-service/src/main/resources/mybatis/mapper/BuyerMapper.xml @@ -27,6 +27,7 @@ + @@ -149,7 +150,8 @@ bmid.phone as bmid_phone, bmid.default_mark, bmid.create_user, - bmid.update_user + bmid.update_user, + bmi.check_bank_flag FROM buyer_manage_info bmi left join buyer_manage_info_detail bmid on bmi.id = bmid.buyer_manage_id @@ -181,7 +183,8 @@ rownum as rowno, status, sync_order, - ent_id + ent_id, + check_bank_flag FROM buyer_manage_info @@ -312,6 +315,9 @@ ent_id = #{buyer.deptId,jdbcType=VARCHAR}, + + check_bank_flag = #{buyer.checkBankFlag,jdbcType=VARCHAR}, + id = #{buyer.id,jdbcType=VARCHAR} @@ -406,6 +412,9 @@ ent_id = #{buyer.deptId,jdbcType=VARCHAR}, + + check_bank_flag = #{buyer.checkBankFlag,jdbcType=VARCHAR}, + id in @@ -535,7 +544,9 @@ ent_id, - + + check_bank_flag, + @@ -614,6 +625,10 @@ #{deptId,jdbcType=VARCHAR}, + + #{checkBankFlag,jdbcType=VARCHAR}, + + @@ -834,7 +849,8 @@ mdm_multicode_json, status, sync_order, - ent_id + ent_id, + check_bank_flag ) values diff --git a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java index bab3c16b..d7df8567 100644 --- a/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java +++ b/order-management-consumer/src/main/java/com/dxhy/order/consumer/modules/order/controller/BuyerController.java @@ -304,6 +304,11 @@ public class BuyerController { if("冻结".equals(buyerImportExcel.getKhzt())){ buyerEntity.setStatus("0"); } + // 开票是否校验银行账号信息 0否 1是 + buyerEntity.setCheckBankFlag("0"); + if ("是".equals(buyerImportExcel.getCheckBankFlag())) { + buyerEntity.setCheckBankFlag("1"); + } //购方名称 带中文括号的转换成英文括号 // 购方名称 带中文括号的转换成英文括号 buyerEntity.setPurchaseName(StringUtil.replaceStr(buyerEntity.getPurchaseName(), true)); diff --git a/order-management-consumer/src/main/resources/download/BuyerExcel.xlsx b/order-management-consumer/src/main/resources/download/BuyerExcel.xlsx index 6b8fa9d1..1dd3e8c2 100644 Binary files a/order-management-consumer/src/main/resources/download/BuyerExcel.xlsx and b/order-management-consumer/src/main/resources/download/BuyerExcel.xlsx differ diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceDetailsController.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceDetailsController.java index 0edb7648..70e072ca 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceDetailsController.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/controller/InvoiceDetailsController.java @@ -97,8 +97,8 @@ public class InvoiceDetailsController { private String yxisuse; @GetMapping("priviewOfd") - public R priviewOfd() throws IOException { - File file = new File("C:\\Users\\10216\\Desktop\\042002200113_04440777.ofd"); + public R priviewOfd(@RequestParam("path") String path) throws IOException { + File file = new File(path); FileInputStream fis = null; ByteArrayOutputStream bos = new ByteArrayOutputStream(1000); diff --git a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java index e8403c09..b4f5ae44 100644 --- a/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java +++ b/order-management-invoice/src/main/java/com/dxhy/order/invoice/module/invoice/service/impl/OfdToPngSDEnergyServiceImpl.java @@ -12,11 +12,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Value; import org.springframework.stereotype.Service; -import java.io.IOException; -import java.lang.reflect.Array; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Date; import java.util.List; @Service @@ -32,7 +28,7 @@ public class OfdToPngSDEnergyServiceImpl implements OfdToPngSDEnergyService { @Override public OfdToPngResponse getOfdPngBySDenergy(byte[] bytes) { - Long timestamp = new Date().getTime(); + Long timestamp = System.currentTimeMillis(); String md5Str = DigestUtil.md5Hex(timestamp + simsSalt); String url = yxurl + "/yxSims/ofdToImage?timestamp="+timestamp+"&md5Str="+md5Str; diff --git a/升级sql/V1.0.5.sql b/升级sql/V1.0.5.sql new file mode 100644 index 00000000..bdda47a2 --- /dev/null +++ b/升级sql/V1.0.5.sql @@ -0,0 +1,3 @@ + +-- 任务4631 客户信息增加校验银行信息开关 +ALTER TABLE buyer_manage_info add check_bank_flag VARCHAR(1) DEFAULT '0' COMMENT '开票是否校验银行账号信息 0否 1是'; \ No newline at end of file