增加融信操作记录

sc-service/src/main/java/com/huyi/service/base/entity/ZcFinanceLog.java

@@ -58,8 +58,8 @@ public class ZcFinanceLog implements Serializable {
     /**
      * 操作完成后的节点
      */
-    @TableField("create_node")
-    private String createNode;
+    @TableField("zfl_node")
+    private String zflNode;
 
 
 }

sc-service/src/main/java/com/huyi/service/common/financeLog/FinanceLog.java

@@ -0,0 +1,44 @@
+package com.huyi.service.common.financeLog;
+
+import com.huyi.service.base.entity.ZcFinanceLog;
+import com.huyi.service.base.service.IZcFinanceLogService;
+import com.tianhu.common.core.utils.IdUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Date;
+
+/**
+ * @author tudc
+ */
+@Component
+public class FinanceLog {
+    @Autowired
+    IZcFinanceLogService financeLogService;
+
+    public final static String STATUS_ZERO = "0";
+    public final static String STATUS_ONE = "1";
+    public final static String STATUS_TWO = "2";
+    public final static String STATUS_THREE = "3";
+
+    /**
+     *
+     * @param financeId 融信id
+     * @param content   融信内容
+     * @param userId    操作用户
+     * @param node      操作后的所属节点
+     *                  融资企业申请------- 0:融信申请,1:平台审批,2:融信确权,3:签收生效
+     *                  核心企业开立------- 0:融信开立,1:补全资料,2:平台审核,3:签收生效
+     *                  融资企业开立------- 0:融信开立,1:平台审核,2:确权生效
+     */
+    public void addFinanceLog(String financeId, String content, Long userId, String node){
+        ZcFinanceLog financeLog = new ZcFinanceLog();
+        financeLog.setZflId(IdUtils.fastSimpleUUID());
+        financeLog.setZflFinanceId(financeId);
+        financeLog.setZflContent(content);
+        financeLog.setZflUserId(userId);
+        financeLog.setZflNode(node);
+        financeLog.setCreateTime(new Date());
+        financeLogService.createZcFinanceLog(financeLog);
+    }
+}

sc-service/src/main/java/com/huyi/service/credit/controller/CreditHandleController.java

@@ -3,6 +3,7 @@ package com.huyi.service.credit.controller;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.huyi.service.base.entity.*;
 import com.huyi.service.base.service.*;
+import com.huyi.service.common.financeLog.FinanceLog;
 import com.huyi.service.common.flowable.service.ApprovalService;
 import com.huyi.service.constant.FileConstants;
 import com.keao.tianhu.core.util.AmtUtil;
@@ -47,9 +48,8 @@ public class CreditHandleController extends BaseController {
     //融信服务类
     @Autowired
     private IZcFinanceInfService financeInfService;
-    //供应商授信服务类
     @Autowired
-    private IZcFinanceSupplierQuotaService financeSupplierQuotaService;
+    private FinanceLog financeLog;
     //融信和应收账款的关系
     @Autowired
     private IZcFinanceBillRelService    financeBillRelService;
@@ -127,6 +127,16 @@ public class CreditHandleController extends BaseController {
         String zfpId = CommonUtil.objToString(map.get("zfpId"));
         //获取当前时间
         Date createTime = DateUtils.getNowDate();
+
+        //核心企业
+        SysCompany coreCompany =  companyService.getById(finance.getZfiCoreId());
+        //核心企业名称
+        String coreName = coreCompany.getScyName();
+        //核心企业
+        SysCompany supplierCompany =  companyService.getById(finance.getZfiSupplierId());
+        //核心企业名称
+        String supplierName = supplierCompany.getScyName();
+
         //供应商申请并且通过
         if("0".equals(zfiCreateType) && "00".equals(flag)){
             //获取授信额度
@@ -182,6 +192,10 @@ public class CreditHandleController extends BaseController {
             financeInf.setUpdateTime(createTime);
             financeInf.setUpdateBy(CommonUtil.objToString(use.getUserId()));
             financeInfService.updateById(financeInf);
+
+            /**融信操作日志*/
+            financeLog.addFinanceLog(zfiId, "融信确权【通过】，融信提交于《"+supplierName+"》签收", null, FinanceLog.STATUS_TWO);
+            financeLog.addFinanceLog(zfiId, "《"+supplierName+"》待签收", null, FinanceLog.STATUS_TWO);
         }else if("2".equals(zfiCreateType) && "00".equals(flag)){//供应商开立并且通过
             ZcFinanceInf financeInf = new ZcFinanceInf();
             //编号
@@ -229,18 +243,15 @@ public class CreditHandleController extends BaseController {
             String zfiNumber = CommonUtil.objToString(map.get("zfiNumber"));
             //金额大写
             String bigAmt = AmtUtil.convert(AmtUtil.moneyFormat(zfiAmount));
-            //核心企业
-            String zfiCoreId = CommonUtil.objToString(map.get("zfiCoreId"));
-            SysCompany coreCompany =  companyService.getById(zfiCoreId);
-            //核心企业名称
-            String coreName = "";
-            if(coreCompany != null){
-                coreName = coreCompany.getScyName();
-            }
+
             //给融资方经办人添加失效消息
             String title = "【确权失败】您提交于"+coreName+"的【"+zfiNumber+"】,融信金额【"+AmtUtil.moneyFormat(zfiAmount)+"】,(大写:"+bigAmt+"),确权失败，该融信已失效";
             remoteSystemService.sendNotice(zfiSupplierId,zfiId,title,"01","03","","0",handler,"", null, null);
 
+            /**融信操作日志*/
+            if ("0".equals(zfiCreateType)) {
+                financeLog.addFinanceLog(zfiId, "融信确权【拒绝】，融信失效，请联系《"+coreName+"》确认业务信息", null, FinanceLog.STATUS_TWO);
+            }
         }else if("00".equals(flag)){
             //调确权审批
             approvalService.coreConfirmationApproval(map);

sc-service/src/main/java/com/huyi/service/util/FlowableService.java

@@ -1,7 +1,9 @@
 package com.huyi.service.util;
 
 import com.alibaba.fastjson.JSON;
+import com.huyi.service.base.service.ISysConfigService;
 import com.tianhu.common.core.utils.CommonUtil;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import javax.servlet.http.HttpServletRequest;
@@ -28,14 +30,21 @@ public class FlowableService {
 	public final static String DELETE_GROUP = "api/deleteGroup";
 	//查询是否配置审批流程
 	public final static String SELECT_APPROVAL = "cloudSupplyChain/selectApproval";
+	//查询是否配置审批流程
+	public final static String FLOWABLE_URL = "flowable_url";
+	@Autowired
+	private ISysConfigService configService;
+
+
 
 	public Map<String, Object> apiPost(String url, Map<String, Object> param) {
 		return apiPost(url, param, null);
 	}
 	public Map<String, Object> apiPost(String url, Map<String, Object> param, HttpServletRequest request) {
+		String flowable_url = configService.selectConfigByKey(FLOWABLE_URL);
 		Map<String, Object> resMap = null;
 		try {
-			resMap = invokeCapp(Constant.FLOWABLE_URL + url, param, request);
+			resMap = invokeCapp(flowable_url + url, param, request);
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

sc-service/src/main/resources/mapper/base/ZcFinanceLogMapper.xml

@@ -9,7 +9,7 @@
         <result column="zfl_content" property="zflContent" />
         <result column="zfl_user_id" property="zflUserId" />
         <result column="create_time" property="createTime" />
-        <result column="create_node" property="createNode" />
+        <result column="zfl_node" property="zflNode" />
     </resultMap>
 
 </mapper>