发起方修改

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/dto/BillingRechargeRecordDTO.java

@@ -45,7 +45,7 @@ public class BillingRechargeRecordDTO implements Serializable {
      */
     private Integer status;
     /**
-     * 发起方  1：运维平台
+     * 发起方  1商户 2运维
      */
     private Integer initiator;
     /**

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/OfflineStrategy.java

@@ -18,7 +18,6 @@ import com.gic.enterprise.entity.TabEnterprise;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.*;
 import com.gic.enterprise.utils.CreateRandomUtils;
-import com.gic.finance.constant.InitiatorTypeEnum;
 import com.gic.finance.dto.TransferAccountsApprovalDTO;
 import com.gic.finance.service.TransferAccountsApprovalApiService;
 import com.gic.marketing.process.api.service.sms.SmsSendApiService;
@@ -207,7 +206,13 @@ public class OfflineStrategy implements PayStrategy {
         approvalDTO.setOrderNumber(outPayDTO.getOrderSerialNumber());
         // gic
         approvalDTO.setPlatformType(1);
-        approvalDTO.setInitiatorType(InitiatorTypeEnum.ENTERPRISE.getCode());
+        if (outPayDTO.getInitiatorUser() != null) {
+            UserDTO userDTO = userApiService.getUserById(outPayDTO.getInitiatorUser()).getResult();
+            if (userDTO != null) {
+                approvalDTO.setInitiatorType(userDTO.getLoginType() == 0 ?
+                        BillingInitiatorTypeEnum.ENTERPRISE.getCode() : BillingInitiatorTypeEnum.OPERATION.getCode());
+            }
+        }
         approvalDTO.setInitiatorName(outPayDTO.getInitiatorName());
         approvalDTO.setPlannedAmount(outPayDTO.getTotalFee());
         approvalDTO.setVerifyCode(outPayDTO.getAuthCode());

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingRechargeController.java

@@ -52,7 +52,8 @@ public class BillingRechargeController {
         BillingRechargeDTO billingRechargeDTO = EntityUtil.changeEntityByOrika(BillingRechargeDTO.class, billingRechargeQO);
         UserDetail userDetail = UserDetailUtils.getUserDetail();
         billingRechargeDTO.setEnterpriseId(userDetail.getEnterpriseId());
-        billingRechargeDTO.setInitiator(BillingInitiatorTypeEnum.ENTERPRISE.getCode());
+        billingRechargeDTO.setInitiator(UserDetailUtils.getUserDetail().getUserInfo().getLoginType() == 0 ?
+                BillingInitiatorTypeEnum.ENTERPRISE.getCode() : BillingInitiatorTypeEnum.OPERATION.getCode());
         billingRechargeDTO.setInitiatorUser(userDetail.getUserId());
         billingRechargeDTO.setInitiatorName(userDetail.getUserInfo().getUserName());
         ServiceResponse<Map<String, Object>> serviceResponse = billingRechargeApiService.saveAndSelectPaymentMethod(billingRechargeDTO);
@@ -68,7 +69,8 @@ public class BillingRechargeController {
         BillingRechargeDTO billingRechargeDTO = EntityUtil.changeEntityByOrika(BillingRechargeDTO.class, billingRechargeQO);
         UserDetail userDetail = UserDetailUtils.getUserDetail();
         billingRechargeDTO.setEnterpriseId(userDetail.getEnterpriseId());
-        billingRechargeDTO.setInitiator(BillingInitiatorTypeEnum.ENTERPRISE.getCode());
+        billingRechargeDTO.setInitiator(UserDetailUtils.getUserDetail().getUserInfo().getLoginType() == 0 ?
+                BillingInitiatorTypeEnum.ENTERPRISE.getCode() : BillingInitiatorTypeEnum.OPERATION.getCode());
         billingRechargeDTO.setInitiatorUser(userDetail.getUserId());
         billingRechargeDTO.setInitiatorName(userDetail.getUserInfo().getUserName());
         ServiceResponse<Integer> serviceResponse = billingRechargeApiService.confirmPay(billingRechargeDTO);