返利凭证对接

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeign.java

@@ -71,6 +71,14 @@ public interface FinKingDeeFeign {
     @ResponseBody
     ResultBean<String> draftOtherReceivableBill(@RequestBody @Valid OtherReceivable otherReceivable);
 
+    //----------------------  返利凭证 ---------------------------------
+    @ApiOperation("保存单车返利预提凭证")
+    @PostMapping("/saveRebatePrepareVoucher")
+    @ResponseBody
+    ResultBean<String> saveRebatePrepareVoucher(@RequestBody @Valid GeneralVoucher voucher);
+
+
+    //----------------------  返利凭证 ---------------------------------
     @ApiOperation("保存凭证的接口")
     @PostMapping("/saveVoucher")
     @ResponseBody

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/FinKingDeeFeignFallBack.java

@@ -28,6 +28,7 @@ import com.yxt.anrui.fin.api.kingdee.voucher.PaymentVoucher;
 import com.yxt.anrui.fin.api.kingdee.voucher.Voucher;
 import com.yxt.common.core.result.ResultBean;
 
+import javax.validation.Valid;
 import java.util.List;
 
 public class FinKingDeeFeignFallBack
@@ -47,6 +48,11 @@ implements FinKingDeeFeign{
         return null;
     }
 
+    @Override
+    public ResultBean<String> saveRebatePrepareVoucher(@Valid GeneralVoucher voucher) {
+        return null;
+    }
+
     @Override
     public ResultBean<String> saveVoucher(Voucher voucher) {
         return null;

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/GeneralVoucher.java

@@ -47,6 +47,10 @@ public class GeneralVoucher {
         @ApiModelProperty("金额")
         @NotBlank(message = "金额不能为空")
         public BigDecimal amount;
+        @ApiModelProperty("核算维度厂商（供应商）")
+        public String manufacturer;
+        @ApiModelProperty("核算维度物料")
+        public String material;
         @ApiModelProperty("备注")
         public String remarks;
     }

anrui-fin/anrui-fin-api/src/main/java/com/yxt/anrui/fin/api/kingdee/voucher/Voucher.java

@@ -39,6 +39,10 @@ public class Voucher {
         public String dimensionCustom;
         @ApiModelProperty("核算维度银行账号")
         public String bankAccount;
+        @ApiModelProperty("核算维度厂商（供应商）")
+        public String manufacturer;
+        @ApiModelProperty("核算维度物料")
+        public String material;
         @ApiModelProperty("核算维度银行")
         public String bank;
         @ApiModelProperty("借方金额")

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/FinKingDeeFeignRest.java

@@ -230,6 +230,42 @@ public class FinKingDeeFeignRest implements FinKingDeeFeign {
         return otherReceivableBillService.otherReceivableBillService(otherReceivable);
     }
 
+    @Override
+    public ResultBean<String> saveRebatePrepareVoucher(@Valid GeneralVoucher voucher) {
+        ResultBean rb = ResultBean.fireFail();
+        Voucher newVoucher = new Voucher();
+        List<Voucher.VoucherResultDetailDto> resultDetails = new ArrayList<>();
+        if (StringUtils.isNotBlank(voucher.getUseOrgCode())) {
+            newVoucher.setAccountBook(voucher.getUseOrgCode());
+            newVoucher.setVoucherNo(voucher.getUseOrgCode());
+        }
+        List<GeneralVoucher.GeneralVoucherDetail> voucherDetails = voucher.getVoucherDetails();
+        if (!voucherDetails.isEmpty()) {
+            for (GeneralVoucher.GeneralVoucherDetail voucherDetail : voucherDetails) {
+                Voucher.VoucherResultDetailDto dto1 = new Voucher.VoucherResultDetailDto(); //借方
+                Voucher.VoucherResultDetailDto dto2 = new Voucher.VoucherResultDetailDto(); //贷方
+                dto1.setSummary(voucherDetail.getTimeFlag() + "月单车返利预提预留费用");
+                dto2.setSummary(voucherDetail.getTimeFlag() + "月单车返利预提预留费用");
+                if (voucherDetail.getSceneCode().equals("上年")) {
+                    dto1.setSubjectNo("1161.02.15");
+                } else if (voucherDetail.getSceneCode().equals("本年")) {
+                    dto1.setSubjectNo("1161.01.15");
+                }
+                dto2.setSubjectNo("2181.07.00");
+                dto1.setDimensionDept(voucherDetail.getDeptCode());
+                dto1.setManufacturer(voucherDetail.getManufacturer());
+                dto2.setDimensionCustom(voucherDetail.getCustomerCode());
+                dto1.setDebit(String.valueOf(voucherDetail.getAmount()));
+                dto2.setCredit(String.valueOf(voucherDetail.getAmount()));
+                resultDetails.add(dto1);
+                resultDetails.add(dto2);
+            }
+            newVoucher.setResultDetails(resultDetails);
+        }
+        log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(newVoucher));
+        return voucherService.saveVoucher(newVoucher);
+    }
+
     @Override
     public ResultBean<String> saveVoucher(Voucher voucher) {
         log.info("FinKingDeeFeignRest-saveVoucher:{}", JSONObject.toJSONString(voucher));

anrui-fin/anrui-fin-biz/src/main/java/com/yxt/anrui/fin/biz/kingdee/voucher/VoucherService.java

@@ -96,11 +96,21 @@ public class VoucherService extends FinKingDeeService {
             } else {
                 m.put("FF100003", "");
             }
+            if (StringUtils.isNotBlank(c.getManufacturer())) {
+                m.put("FFLEX4", c.getManufacturer());
+            } else {
+                m.put("FFLEX4", "");
+            }
             if (StringUtils.isNotBlank(c.getDimensionCustom())) {
                 m.put("FFLEX6", c.getDimensionCustom());
             } else {
                 m.put("FFLEX6", "");
             }
+            if (StringUtils.isNotBlank(c.getMaterial())) {
+                m.put("FFLEX8", c.getMaterial());
+            } else {
+                m.put("FFLEX8", "");
+            }
             if (StringUtils.isNotBlank(c.getBankAccount())) {
                 m.put("FF100002", c.getBankAccount());
             } else {