调整

src/main/java/com/qs/cost/common/dto/u8/U8RequestBo.java

@@ -26,6 +26,8 @@ public class U8RequestBo {
     @NotNull
     private String cmd;
 
+    private String logindate;
+
     /**
      * 年度
      */

src/main/java/com/qs/cost/module/controller/LzOrderController.java

@@ -1,24 +0,0 @@
-package com.qs.cost.module.controller;
-
-import com.qs.cost.common.dto.R;
-import com.qs.cost.common.dto.u8.U8CallbackVo;
-import com.qs.cost.common.utils.JsonUtil;
-import lombok.AllArgsConstructor;
-import org.springframework.web.bind.annotation.*;
-
-/**
- * @author YenHex
- * @since 2022/7/7
- */
-@AllArgsConstructor
-@RestController
-@RequestMapping("/u8")
-public class LzOrderController {
-
-    @PostMapping("/callback")
-    public R callback(@RequestBody U8CallbackVo requestVo){
-        System.out.println(JsonUtil.objectToJson(requestVo));
-        return R.ok();
-    }
-
-}

src/main/java/com/qs/cost/module/controller/U8CallBackController.java

@@ -0,0 +1,46 @@
+package com.qs.cost.module.controller;
+
+import com.qs.cost.common.dto.R;
+import com.qs.cost.common.dto.u8.U8CallbackVo;
+import com.qs.cost.common.utils.JsonUtil;
+import com.qs.cost.module.mapper.VmSupplierMapper;
+import com.qs.cost.module.service.VmSupplierService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.*;
+
+/**
+ * @author YenHex
+ * @since 2022/7/7
+ */
+@Slf4j
+@AllArgsConstructor
+@RestController
+@RequestMapping("/u8")
+public class U8CallBackController {
+
+    VmSupplierService vmSupplierService;
+    VmSupplierMapper vmSupplierMapper;
+
+    @PostMapping("/callback")
+    public R callback(@RequestBody U8CallbackVo requestVo){
+        log.debug("callback:{}",JsonUtil.objectToJson(requestVo));
+        if(requestVo.getApiCmd().equals("BasicVendor")){
+            String pk = requestVo.getApiPk();
+            //回调更新状态
+            log.info("回调更新状态,PK:{}",pk);
+            //vmSupplierMapper.updateSupplierFormState(pk);
+            String testValue = vmSupplierMapper.testSupplierFormState(pk);
+            log.debug("testValue:{}",testValue);
+        }
+        return R.ok();
+    }
+
+    @GetMapping("/test")
+    public R callback(){
+        //String testValue = vmSupplierMapper.testSupplierFormState("202209280264");
+        vmSupplierService.test();
+        return R.ok();
+    }
+
+}

src/main/java/com/qs/cost/module/domain/VmSupplierPo.java

@@ -2,6 +2,7 @@ package com.qs.cost.module.domain;
 
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 
 import java.util.Date;
@@ -11,6 +12,7 @@ import java.util.Date;
  * @since 2022/9/27
  */
 @Data
+@TableName("vw_IncreaseSupplierData")
 public class VmSupplierPo {
 
     @TableId(value = "serialNumber")
@@ -28,36 +30,47 @@ public class VmSupplierPo {
     @TableField(value = "applyType")
     private String applyType;
 
+    /** 客户编码 */
     @TableField(value = "cVenCode")
     private String cVenCode;
 
+    /** 客户名称 */
     @TableField(value = "cVenName")
     private String cVenName;
 
+    /** 客户简称 */
     @TableField(value = "cVenAbbName")
     private String cVenAbbName;
 
+    /** 客户分类编码 */
     @TableField(value = "cVCCode")
     private String cVCCode;
 
+    /** 客户分类名称 */
     @TableField(value = "cVCName")
     private String cVCName;
 
+    /** 地区编码 */
     @TableField(value = "cDCCode")
     private String cDCCode;
 
+    /** 地区名称 */
     @TableField(value = "cDCName")
     private String cDCName;
 
+    /** 地址 */
     @TableField(value = "cCusAddress")
     private String cCusAddress;
 
+    /** 邮箱号 */
     @TableField(value = "cCusEmail")
     private String cCusEmail;
 
+    /** 法人代表 */
     @TableField(value = "cCusPerson")
     private String cCusPerson;
 
+    /** 手机号码 */
     @TableField(value = "cCusPhone")
     private String cCusPhone;
 

src/main/java/com/qs/cost/module/domain/dto/U8Vendor.java

@@ -5,13 +5,26 @@ import lombok.Data;
 
 /**
  *
- * Vendor t = new Vendor();
+     //t.Editprop = "A";//编辑属性：A表新增，M表修改 string类型
- * t.Editprop = "A";//编辑属性：A表新增，M表修改 string类型
+     //t.cVenCode = "01020302";//供应商编码 (必填)
- * t.cVenCode = "01020302";//供应商编码 (必填)
+     //t.cVenName = "测试名称";//供应商名称 (必填)
- * t.cVenName = "测试名称";//供应商名称 (必填)
+     //t.cVenAbbName = "测试";//供应商简称
- * t.cVenAbbName = "测试";//供应商简称
+     //t.cVCCode = "01";//供应商分类编码(必填)
- * t.cVCCode = "01";//供应商分类编码(必填)
+     //t.cDCCode = "";//地区编码
- * t.cDCCode = "";//地区编码
+     //t.cTrade = "";//所属行业 ---
+     //t.cVenAddress = "";//地址
+     //t.cVenPostCode = "";//邮政编码 ---
+     //t.cVenRegCode = "";//纳税人登记号
+     //t.cVenBank = "";//开户银行
+     //t.cVenAccount = "";//银行账号
+     //t.cVenLPerson = "";//法人
+     //t.cVenPhone = "";//电话
+     //t.cVenFax = "";//传真
+     //t.cVenEmail = "";//Email地址
+     //t.cVenPerson = "";//联系人
+     //t.cVenBusinessNo = "";//生产/经营许可证号
+     //t.cVenEnAddr1 = "";//英文地址1
+     //t.cVenEnName = "";//英文名称
  *
  * @author YenHex
  * @since 2022/9/27
@@ -36,4 +49,47 @@ public class U8Vendor {
 
     @JsonProperty("cDCCode")
     private String cDCCode;
+
+    @JsonProperty("cTrade")
+    private String cTrade;
+
+    @JsonProperty("cVenAddress")
+    private String cVenAddress;
+
+    @JsonProperty("cVenPostCode")
+    private String cVenPostCode;
+
+    @JsonProperty("cVenRegCode")
+    private String cVenRegCode;
+
+    @JsonProperty("cVenBank")
+    private String cVenBank;
+
+    @JsonProperty("cVenAccount")
+    private String cVenAccount;
+
+    @JsonProperty("cVenLPerson")
+    private String cVenLPerson;
+
+    @JsonProperty("cVenPhone")
+    private String cVenPhone;
+
+    @JsonProperty("cVenFax")
+    private String cVenFax;
+
+    @JsonProperty("cVenEmail")
+    private String cVenEmail;
+
+    @JsonProperty("cVenPerson")
+    private String cVenPerson;
+
+    @JsonProperty("cVenBusinessNo")
+    private String cVenBusinessNo;
+
+    @JsonProperty("cVenEnAddr1")
+    private String cVenEnAddr1;
+
+    @JsonProperty("cVenEnName")
+    private String cVenEnName;
+
 }

src/main/java/com/qs/cost/module/mapper/VmSupplierMapper.java

@@ -3,6 +3,7 @@ package com.qs.cost.module.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.qs.cost.module.domain.VmSupplierPo;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * @author YenHex
@@ -10,4 +11,18 @@ import org.apache.ibatis.annotations.Mapper;
  */
 public interface VmSupplierMapper extends BaseMapper<VmSupplierPo> {
 
+    /**
+     * 回调更新表单数据
+     * @param serialNumber
+     * @return
+     */
+    int updateSupplierFormState(@Param("serialNumber") String serialNumber);
+
+    /**
+     * 测试
+     * @param serialNumber
+     * @return
+     */
+    String testSupplierFormState(@Param("serialNumber") String serialNumber);
+
 }

src/main/java/com/qs/cost/module/service/VmSupplierService.java

@@ -34,15 +34,30 @@ public class VmSupplierService {
             U8Vendor vendor = new U8Vendor();
             //编辑属性：A表新增，M表修改 string类型
             vendor.setEditprop("A");
-            vendor.setCVenCode(supplierPo.getCVenCode());
+            //vendor.setCVenCode(supplierPo.getCVenCode());
+            vendor.setCVenCode("123");
             vendor.setCVenName(supplierPo.getCVenName());
             vendor.setCVenAbbName(supplierPo.getCVenAbbName());
             vendor.setCDCCode(supplierPo.getCDCCode());
             vendor.setCVcCode(supplierPo.getCVCCode());
-            String jsonBody = JsonUtil.objectToJson(vendor);
+            vendor.setCVenAddress(supplierPo.getCCusAddress());
+            vendor.setCVenPerson(supplierPo.getCCusPerson());
+            vendor.setCVenPhone(supplierPo.getCCusPhone());
+            vendor.setCVenEmail(supplierPo.getCCusEmail());
+            vendor.setCVenLPerson(supplierPo.getCCusPerson());
+            vendor.setCVenFax("");
+            vendor.setCTrade("");
+            vendor.setCVenPostCode("");
+            vendor.setCVenRegCode("");
+            vendor.setCVenBank("");
+            vendor.setCVenAccount("");
+            vendor.setCVenBusinessNo("");
+            vendor.setCVenEnAddr1("");
+            vendor.setCVenEnName("");
+            String jsonBody = JsonUtil.objectToJson(Arrays.asList(vendor));
             //发起U8服务中台
             U8RequestBo requestBo = new U8RequestBo();
-            requestBo.setPk(vendor.getCVenCode());
+            requestBo.setPk(supplierPo.getSerialNumber());
             requestBo.setCmd("BasicVendor");
             requestBo.setYear(year);
             requestBo.setBook(book);
@@ -50,9 +65,10 @@ public class VmSupplierService {
             requestBo.setKeyId("");
             requestBo.setSettingRetryTimes(2);
             requestBo.setCallbackState("1");
-            requestBo.setCallbackHost( host + "/lzOrder/callback");
+            requestBo.setCallbackHost( host + "/u8/callback");
+            requestBo.setLogindate("2020-12-30");
             HttpUtil.post(mainServerProperties.getU8url(),JsonUtil.objectToJson(requestBo));
-
+            return;
         }
     }
 

src/main/resources/application-dev.yml

@@ -4,7 +4,7 @@ server:
   #本服务访问根地址，用于回调
   host: 'http://127.0.0.1:7101'
   #帐套
-  book: 999
+  book: '001'
   #年份
   year: 2020
   #U8平台
@@ -14,9 +14,9 @@ spring:
   #数据源
   datasource:
     #url: jdbc:mysql://127.0.0.1:3333/jsl_cost_api?useUnicode=true&characterEncoding=utf-8&serverTimezone=Asia/Shanghai
-    url: jdbc:sqlserver://192.168.10.7:1433;DatabaseName=JSLGROUPDB
+    url: jdbc:sqlserver://192.168.10.7:1433;DatabaseName=OAdata
     username: sa
-    password: '#JSL2282125'
+    password: 'JSL2282125'
     #driverClassName: com.mysql.cj.jdbc.Driver
     driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
 #mybatis plus

src/main/resources/mapper/VmSupplierMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<!DOCTYPE mapper
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qs.cost.module.mapper.VmSupplierMapper">
+
+    <update id="updateSupplierFormState">
+        update f1
+        set f1.field0004 = 1,f1.field0005 = GETDATE()
+            from [OAdata].[dbo].formmain_1681 f1
+        where f1.field0001 = #{serialNumber}
+    </update>
+    <select id="testSupplierFormState" resultType="java.lang.String">
+        select f1.field0004
+        from [OAdata].[dbo].formmain_1681 f1
+        where f1.field0001 = #{serialNumber}
+    </select>
+
+
+</mapper>