转账审批详情添加订单数据字段

gic-platform-finance-service/src/main/java/com/gic/finance/util/AsynCallbackUtils.java

@@ -3,10 +3,11 @@ package com.gic.finance.util;
 import org.apache.dubbo.config.ReferenceConfig;
 import org.apache.dubbo.config.RegistryConfig;
 import org.apache.dubbo.rpc.service.GenericService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 
 import com.alibaba.fastjson.JSONObject;
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+
 /**
  * 回调方法工具
  * @ClassName: AsynCallbackUtils

@@ -15,7 +16,7 @@ import com.alibaba.fastjson.JSONObject;
  * @date 2019/9/12 1:52 PM

  */
 public class AsynCallbackUtils {
-    private static final Logger LOGGER = LoggerFactory.getLogger(AsynCallbackUtils.class);
+    private static Logger logger = LogManager.getLogger(AsynCallbackUtils.class);
 
     /**
      * 回调
@@ -28,7 +29,7 @@ public class AsynCallbackUtils {
      * @return  void

     
 */
     public static void callBack(Object obj, String interfaceUrl, String method) {
-        LOGGER.info("转账审批回调：{}，接口路径：{}，接口方法名称:{}" ,JSONObject.toJSONString(obj), interfaceUrl, method);
+        logger.info("转账审批回调：{}，接口路径：{}，接口方法名称:{}" ,JSONObject.toJSONString(obj), interfaceUrl, method);
         RegistryConfig registry = new RegistryConfig();
         registry.setAddress("zookeeper://10.105.220.75:2199");
         registry.setCheck(false);

gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/TransferAccountsApprovalController.java

@@ -105,6 +105,9 @@ public class TransferAccountsApprovalController {
                     //支付流水号
                     vo.setPayInfoSerialNumber(orderDTO.getPayNumber());
                     vo.setTotalCountFee(transfer.getPlannedAmount());
+                    vo.setRelationOrderType(orderDTO.getOrderType());
+                    vo.setOperType(orderDTO.getOperType());
+                    vo.setOperName(orderDTO.getOperName());
                     String couponName = orderDTO.getCouponName();
                     if (!StringUtils.isBlank(couponName)) {
                         ServiceDiscountVO discountVO = new ServiceDiscountVO();

gic-platform-finance-web/src/main/java/com/gic/finance/web/vo/TransferApprovalServiceVO.java

@@ -5,6 +5,7 @@ import java.util.Date;
 import java.util.List;
 
 import com.gic.finance.constant.EnterprisePlatformTypeEnum;
+import com.gic.finance.constant.OrderTypeEnum;
 import com.gic.finance.constant.TransferAccountApprovalStatusEnum;
 import com.gic.finance.web.utils.DateUtils;
 
@@ -109,13 +110,20 @@ public class TransferApprovalServiceVO implements Serializable{
     private Date orderCreateTime;
 
     /**
-     * 1购买 2续费 3升级 4扩容
+     * 1:套餐包 2:拓展包 3:服务 4:短信套餐包 5:充值
      */
     private Integer orderType;
+
+    private String orderTypeStr;
+
+    /**
+     * 1购买 2续费 3升级 4扩容
+     */
+    private Integer relationOrderType;
     /**
      * 订购类型
      */
-    private String orderTypeStr;
+    private String relationOrderTypeStr;
     /**
      * 支付方式
      */
@@ -126,6 +134,12 @@ public class TransferApprovalServiceVO implements Serializable{
     private String payTypeStr;
 
     /**
+     * 操作人类型(1:商户,2:运维)
+     */
+    private Integer operType;
+    private String operTypeStr;
+    private String operName;
+    /**
      * 优惠方式
      */
     private ServiceDiscountVO serviceDiscountVO;
@@ -296,6 +310,18 @@ public class TransferApprovalServiceVO implements Serializable{
     }
 
     public String getOrderTypeStr() {
+        return OrderTypeEnum.getMessageBuCode(orderType);
+    }
+
+    public Integer getRelationOrderType() {
+        return relationOrderType;
+    }
+
+    public void setRelationOrderType(Integer relationOrderType) {
+        this.relationOrderType = relationOrderType;
+    }
+
+    public String getRelationOrderTypeStr() {
         //1购买 2续费 3升级 4扩容
         if (orderType == null) {
             return "--";
@@ -312,10 +338,6 @@ public class TransferApprovalServiceVO implements Serializable{
         return "未知";
     }
 
-    public void setOrderTypeStr(String orderTypeStr) {
-        this.orderTypeStr = orderTypeStr;
-    }
-
     public Integer getPayType() {
         return payType;
     }
@@ -377,4 +399,30 @@ public class TransferApprovalServiceVO implements Serializable{
     public void setExpandPackageVOList(List<ExpandPackageVO> expandPackageVOList) {
         this.expandPackageVOList = expandPackageVOList;
     }
+
+
+    public void setOperType(Integer operType) {
+        this.operType = operType;
+    }
+
+    public String getOperTypeStr() {
+        if (operType == null) {
+            return "--";
+        }
+        if (operType == 1) {
+            return "商户";
+        }
+        if (operType == 2) {
+            return "运维";
+        }
+        return "--";
+    }
+
+    public String getOperName() {
+        return operName;
+    }
+
+    public void setOperName(String operName) {
+        this.operName = operName;
+    }
 }