转账审批详情

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

@@ -6,12 +6,23 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.gic.api.base.commons.ServiceResponse;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
+import com.gic.enterprise.dto.BillingOrderDTO;
+import com.gic.enterprise.dto.BillingRechargeRecordDTO;
+import com.gic.enterprise.error.ErrorCode;
+import com.gic.enterprise.response.EnterpriseRestResponse;
+import com.gic.enterprise.service.BillingOrderApiService;
+import com.gic.enterprise.service.BillingRechargeRecordApiService;
 import com.gic.enterprise.utils.ResultControllerUtils;
+import com.gic.finance.constant.OrderTypeEnum;
+import com.gic.finance.dto.TransferAccountsApprovalDTO;
 import com.gic.finance.qo.TransferListQueryQO;
 import com.gic.finance.service.TransferAccountsApprovalApiService;
-import com.gic.finance.web.vo.TransferApprovalDetailVO;
 import com.gic.finance.web.vo.TransferApprovalListVO;
+import com.gic.finance.web.vo.TransferApprovalRechargeVO;
+import com.gic.finance.web.vo.TransferApprovalSmsVO;
 
 /**
  * 转账审批
@@ -27,10 +38,52 @@ public class TransferAccountsApprovalController {
 
     @Autowired
     private TransferAccountsApprovalApiService transferAccountsApprovalApiService;
+    @Autowired
+    private BillingOrderApiService billingOrderApiService;
+    @Autowired
+    private BillingRechargeRecordApiService billingRechargeRecordApiService;
 
     @RequestMapping("/get-approval")
     public RestResponse getById(Integer id) {
-        return ResultControllerUtils.commonResultOne(transferAccountsApprovalApiService.getById(id), TransferApprovalDetailVO.class);
+        ServiceResponse<TransferAccountsApprovalDTO> transferResult = transferAccountsApprovalApiService.getById(id);
+        if (transferResult.isSuccess()) {
+            TransferAccountsApprovalDTO transfer = transferResult.getResult();
+            //短信套餐包
+            if (transfer.getOrderType().intValue() == OrderTypeEnum.SHORT_MESSAGE_PACKAGE.getCode()) {
+                ServiceResponse<BillingOrderDTO> orderDetail = billingOrderApiService
+                        .getOrderBySerialNumber(transfer.getOrderNumber());
+
+                TransferApprovalSmsVO vo = EntityUtil.changeEntityNew(TransferApprovalSmsVO.class, transfer);
+                if (orderDetail.isSuccess()) {
+                    BillingOrderDTO order = orderDetail.getResult();
+                    //订单详情
+                    vo.setOrderItemJson(order.getItemJson());
+                    vo.setPayInfoSerialNumber(order.getPayInfoSerialNumber());
+                    vo.setCouponCardContent(order.getCouponCardContent());
+                    vo.setCouponCardName(order.getCouponCardName());
+                    return RestResponse.success(vo);
+                } else {
+                    return EnterpriseRestResponse.failure(orderDetail);
+                }
+            } else if (transfer.getOrderType().intValue() == OrderTypeEnum.RECHARGE.getCode()) {
+                TransferApprovalRechargeVO vo = EntityUtil.changeEntityNew(TransferApprovalRechargeVO.class, transfer);
+
+                ServiceResponse<BillingRechargeRecordDTO> rechargeResult = billingRechargeRecordApiService
+                        .getRechargeRecordForApproval(transfer.getOrderNumber());
+                if (rechargeResult.isSuccess()) {
+                    BillingRechargeRecordDTO recharge = rechargeResult.getResult();
+                    //支付流水号
+                    vo.setPayInfoSerialNumber(recharge.getPayInfoSerialNumber());
+                    return RestResponse.success(vo);
+                } else {
+                    return EnterpriseRestResponse.failure(rechargeResult);
+                }
+            } else {
+                return RestResponse.failure(ErrorCode.SYSTEM_ERROR.getCode(), "目前没有该类型的数据");
+            }
+        } else {
+            return EnterpriseRestResponse.failure(transferResult);
+        }
     }
 
     @RequestMapping("/agree-approval")

gic-platform-finance-web/src/main/java/com/gic/finance/web/exception/GlobalExceptionHandler.java

@@ -68,7 +68,9 @@ public class GlobalExceptionHandler {
                     .append(fieldError.getDefaultMessage())
                     .append(",");
         });
-        return getRestResponse(ErrorCode.PARAMETER_ERROR.getCode(), errorMessage.toString());
+        String error = errorMessage.toString();
+        int length = error.length();
+        return getRestResponse(ErrorCode.PARAMETER_ERROR.getCode(), error.substring(0, length - 1));
     }
 
     @ResponseBody

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

@@ -115,6 +115,11 @@ public class TransferApprovalDetailVO implements Serializable{
      */
     private Date approvalTime;
 
+    /**
+     * 订单项
+     */
+    private String orderItemJson;
+
     public Integer getTransferApprovalId() {
         return transferApprovalId;
     }
@@ -258,4 +263,12 @@ public class TransferApprovalDetailVO implements Serializable{
     public void setApprovalPhoneAreaCode(String approvalPhoneAreaCode) {
         this.approvalPhoneAreaCode = approvalPhoneAreaCode;
     }
+
+    public String getOrderItemJson() {
+        return orderItemJson;
+    }
+
+    public void setOrderItemJson(String orderItemJson) {
+        this.orderItemJson = orderItemJson;
+    }
 }

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

+package com.gic.finance.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.gic.finance.constant.EnterprisePlatformTypeEnum;
+import com.gic.finance.constant.InitiatorTypeEnum;
+import com.gic.finance.constant.TransferAccountApprovalStatusEnum;
+
+/**
+ * 转账审批详情VO-充值
+ * @ClassName: TransferApprovalListVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/9 5:38 PM

+ */
+public class TransferApprovalRechargeVO implements Serializable{
+
+    private static final long serialVersionUID = 2734432063082008967L;
+    private Integer transferApprovalId;
+
+    /**
+     * 关联订单平台方（商户类型）1:GIC 2: 好办
+     */
+    private Integer platformType;
+    /**
+     * 商户类型名称
+     */
+    private String platformTypeStr;
+
+    /**
+     * 计划金额
+     */
+    private Double plannedAmount;
+
+    /**
+     * 坏账金额
+     */
+    private Double badAmount;
+
+    /**
+     * 验证码
+     */
+    private String verifyCode;
+
+    /**
+     * 审批流水号
+     */
+    private String approvalNumber;
+
+    /**
+     * 审批状态 1:待审批 2:已取消 3:已驳回 4:审批通过
+     */
+    private Integer approvalStatus;
+    /**
+     * 审批状态 名称
+     */
+    private String approvalStatusStr;
+
+    /**
+     * 审批人姓名
+     */
+    private String approvalName;
+
+    /**
+     * 审批人手机号码
+     */
+    private String approvalPhone;
+
+    /**
+     * 审批人手机号国际区号
+     */
+    private String approvalPhoneAreaCode;
+
+    /**
+     * 审批时间
+     */
+    private Date approvalTime;
+
+    /**
+     * 支付流水号
+     */
+    private String payInfoSerialNumber;
+
+    public Integer getTransferApprovalId() {
+        return transferApprovalId;
+    }
+
+    public void setTransferApprovalId(Integer transferApprovalId) {
+        this.transferApprovalId = transferApprovalId;
+    }
+
+    public void setPlatformType(Integer platformType) {
+        this.platformType = platformType;
+    }
+
+    public String getPlatformTypeStr() {
+        return EnterprisePlatformTypeEnum.getMessageByCode(platformType);
+    }
+
+    public Double getPlannedAmount() {
+        return plannedAmount;
+    }
+
+    public void setPlannedAmount(Double plannedAmount) {
+        this.plannedAmount = plannedAmount;
+    }
+
+    public Double getBadAmount() {
+        return badAmount;
+    }
+
+    public void setBadAmount(Double badAmount) {
+        this.badAmount = badAmount;
+    }
+
+    public String getVerifyCode() {
+        return verifyCode;
+    }
+
+    public void setVerifyCode(String verifyCode) {
+        this.verifyCode = verifyCode;
+    }
+
+    public String getApprovalNumber() {
+        return approvalNumber;
+    }
+
+    public void setApprovalNumber(String approvalNumber) {
+        this.approvalNumber = approvalNumber;
+    }
+
+    public void setApprovalStatus(Integer approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public String getApprovalStatusStr() {
+        return TransferAccountApprovalStatusEnum.getMessageBuCode(approvalStatus);
+    }
+
+    public String getApprovalName() {
+        return approvalName;
+    }
+
+    public void setApprovalName(String approvalName) {
+        this.approvalName = approvalName;
+    }
+
+    public Date getApprovalTime() {
+        return approvalTime;
+    }
+
+    public void setApprovalTime(Date approvalTime) {
+        this.approvalTime = approvalTime;
+    }
+
+    public String getApprovalPhone() {
+        return approvalPhone;
+    }
+
+    public void setApprovalPhone(String approvalPhone) {
+        this.approvalPhone = approvalPhone;
+    }
+
+    public String getApprovalPhoneAreaCode() {
+        return approvalPhoneAreaCode;
+    }
+
+    public void setApprovalPhoneAreaCode(String approvalPhoneAreaCode) {
+        this.approvalPhoneAreaCode = approvalPhoneAreaCode;
+    }
+
+    public String getPayInfoSerialNumber() {
+        return payInfoSerialNumber;
+    }
+
+    public void setPayInfoSerialNumber(String payInfoSerialNumber) {
+        this.payInfoSerialNumber = payInfoSerialNumber;
+    }
+}

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

+package com.gic.finance.web.vo;
+
+import java.io.Serializable;
+import java.util.Date;
+
+import com.gic.finance.constant.EnterprisePlatformTypeEnum;
+import com.gic.finance.constant.InitiatorTypeEnum;
+import com.gic.finance.constant.TransferAccountApprovalStatusEnum;
+
+/**
+ * 转账审批详情VO-短信套餐包
+ * @ClassName: TransferApprovalListVO

+ * @Description: 

+ * @author guojuxing

+ * @date 2019/8/9 5:38 PM

+ */
+public class TransferApprovalSmsVO implements Serializable{
+
+    private static final long serialVersionUID = -7646329468400077405L;
+    private Integer transferApprovalId;
+
+    /**
+     * 关联订单平台方（商户类型）1:GIC 2: 好办
+     */
+    private Integer platformType;
+    /**
+     * 商户类型名称
+     */
+    private String platformTypeStr;
+
+    /**
+     * 计划金额
+     */
+    private Double plannedAmount;
+
+    /**
+     * 坏账金额
+     */
+    private Double badAmount;
+
+    /**
+     * 验证码
+     */
+    private String verifyCode;
+
+    /**
+     * 审批流水号
+     */
+    private String approvalNumber;
+
+    /**
+     * 审批状态 1:待审批 2:已取消 3:已驳回 4:审批通过
+     */
+    private Integer approvalStatus;
+    /**
+     * 审批状态 名称
+     */
+    private String approvalStatusStr;
+
+    /**
+     * 审批人姓名
+     */
+    private String approvalName;
+
+    /**
+     * 审批人手机号码
+     */
+    private String approvalPhone;
+
+    /**
+     * 审批人手机号国际区号
+     */
+    private String approvalPhoneAreaCode;
+
+    /**
+     * 审批时间
+     */
+    private Date approvalTime;
+
+    /**
+     * 订单项
+     */
+    private String orderItemJson;
+
+    /**
+     * 支付流水号
+     */
+    private String payInfoSerialNumber;
+
+    /**
+     * 优惠内容
+     */
+    private Double couponCardContent;
+    /**
+     * 优惠券名
+     */
+    private String couponCardName;
+
+    public Integer getTransferApprovalId() {
+        return transferApprovalId;
+    }
+
+    public void setTransferApprovalId(Integer transferApprovalId) {
+        this.transferApprovalId = transferApprovalId;
+    }
+
+    public void setPlatformType(Integer platformType) {
+        this.platformType = platformType;
+    }
+
+    public String getPlatformTypeStr() {
+        return EnterprisePlatformTypeEnum.getMessageByCode(platformType);
+    }
+
+    public Double getPlannedAmount() {
+        return plannedAmount;
+    }
+
+    public void setPlannedAmount(Double plannedAmount) {
+        this.plannedAmount = plannedAmount;
+    }
+
+    public Double getBadAmount() {
+        return badAmount;
+    }
+
+    public void setBadAmount(Double badAmount) {
+        this.badAmount = badAmount;
+    }
+
+    public String getVerifyCode() {
+        return verifyCode;
+    }
+
+    public void setVerifyCode(String verifyCode) {
+        this.verifyCode = verifyCode;
+    }
+
+    public String getApprovalNumber() {
+        return approvalNumber;
+    }
+
+    public void setApprovalNumber(String approvalNumber) {
+        this.approvalNumber = approvalNumber;
+    }
+
+    public void setApprovalStatus(Integer approvalStatus) {
+        this.approvalStatus = approvalStatus;
+    }
+
+    public String getApprovalStatusStr() {
+        return TransferAccountApprovalStatusEnum.getMessageBuCode(approvalStatus);
+    }
+
+    public String getApprovalName() {
+        return approvalName;
+    }
+
+    public void setApprovalName(String approvalName) {
+        this.approvalName = approvalName;
+    }
+
+    public Date getApprovalTime() {
+        return approvalTime;
+    }
+
+    public void setApprovalTime(Date approvalTime) {
+        this.approvalTime = approvalTime;
+    }
+
+    public String getApprovalPhone() {
+        return approvalPhone;
+    }
+
+    public void setApprovalPhone(String approvalPhone) {
+        this.approvalPhone = approvalPhone;
+    }
+
+    public String getApprovalPhoneAreaCode() {
+        return approvalPhoneAreaCode;
+    }
+
+    public void setApprovalPhoneAreaCode(String approvalPhoneAreaCode) {
+        this.approvalPhoneAreaCode = approvalPhoneAreaCode;
+    }
+
+    public String getOrderItemJson() {
+        return orderItemJson;
+    }
+
+    public void setOrderItemJson(String orderItemJson) {
+        this.orderItemJson = orderItemJson;
+    }
+
+    public String getPayInfoSerialNumber() {
+        return payInfoSerialNumber;
+    }
+
+    public void setPayInfoSerialNumber(String payInfoSerialNumber) {
+        this.payInfoSerialNumber = payInfoSerialNumber;
+    }
+
+    public Double getCouponCardContent() {
+        return couponCardContent;
+    }
+
+    public void setCouponCardContent(Double couponCardContent) {
+        this.couponCardContent = couponCardContent;
+    }
+
+    public String getCouponCardName() {
+        return couponCardName;
+    }
+
+    public void setCouponCardName(String couponCardName) {
+        this.couponCardName = couponCardName;
+    }
+}

gic-platform-finance-web/src/main/resources/dubbo-gic-platform-finance-web.xml

@@ -43,4 +43,8 @@
     <dubbo:reference id="gicLogService" interface="com.gic.authcenter.api.service.GicLogService"/>
     <dubbo:reference id="gicAppService" interface="com.gic.authcenter.api.service.GicAppService"/>
     <dubbo:reference id="gicUserService" interface="com.gic.authcenter.api.service.GicUserService"/>
+
+
+    <dubbo:reference interface="com.gic.enterprise.service.BillingOrderApiService" id="billingOrderApiService" timeout="60000" />
+    <dubbo:reference interface="com.gic.enterprise.service.BillingRechargeRecordApiService" id="billingRechargeRecordApiService" timeout="60000" />
 </beans>
\ No newline at end of file