Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/BillingOrderApiService.java

@@ -26,7 +26,7 @@ public interface BillingOrderApiService {
      */
     ServiceResponse<Integer> saveSmsOrderBuyNow(BillingOrderDTO billingOrderDTO, SmsPackageOrderItemDTO smsPackageOrderItemDTO);
 
-    ServiceResponse<BillingPayInfoDTO> paySmsPackageOrder(Integer enterpriseId, Integer orderId, Integer payType, String authCode);
+    ServiceResponse<BillingPayInfoDTO> paySmsPackageOrder(Integer enterpriseId, Integer orderId, Integer payType, String authCode, String userName);
 
     /**
      * 条件分页查询订单状态

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

@@ -188,7 +188,7 @@ public class BillingAccountApiServiceImpl implements BillingAccountApiService {
                     ServiceResponse<Integer> orderResponse = billingOrderApiService.saveSmsOrderBuyNow(orderDTO, itemDTO);
                     //订购短信套餐包
                     billingOrderApiService.
-                            paySmsPackageOrder(enterpriseId, orderResponse.getResult(), PayTypeEnum.BALANCE_PAY.getCode(), null);
+                            paySmsPackageOrder(enterpriseId, orderResponse.getResult(), PayTypeEnum.BALANCE_PAY.getCode(), null, null);
                 }
             }
         } else {

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

@@ -98,7 +98,8 @@ public class BillingOrderApiServcImpl implements BillingOrderApiService {
 
     @Override
     @Transactional
-    public ServiceResponse<BillingPayInfoDTO> paySmsPackageOrder(Integer enterpriseId, Integer orderId, Integer payType, String authCode){
+    public ServiceResponse<BillingPayInfoDTO> paySmsPackageOrder(Integer enterpriseId, Integer orderId, Integer payType,
+                                                                 String authCode, String userName){
         TabBillingOrder order = this.billingOrderService.getOrderById(orderId);
         OutPayDTO outPayDTO = new OutPayDTO();
         outPayDTO.setEnterpriseId(enterpriseId);
@@ -117,6 +118,7 @@ public class BillingOrderApiServcImpl implements BillingOrderApiService {
         outPayDTO.setOrderSerialNumber(order.getSerialNumber());
         outPayDTO.setPayType(payType);
         outPayDTO.setAuthCode(authCode);
+        outPayDTO.setInitiatorName(userName);
         ServiceResponse<BillingPayInfoDTO> response = this.billingPayInfoApiService.savePrePayInfo(outPayDTO);
         if(response.isSuccess()){
             Integer payInfoId = response.getResult().getPayInfoId();

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

@@ -110,7 +110,7 @@ public class PackageController {
         this.authCodeApiService.expireAuthCode(authCodeId);
         Integer enterpriseId = UserDetailUtils.getUserDetail().getEnterpriseId();
         ServiceResponse<BillingPayInfoDTO> serviceResponse = this.billingOrderApiService.
-                paySmsPackageOrder(enterpriseId, orderId, payType, authCode);
+                paySmsPackageOrder(enterpriseId, orderId, payType, authCode, UserDetailUtils.getUserDetail().getUserInfo().getUserName());
         if(serviceResponse.isSuccess()){
             LogUtils.createLog("套餐包支付", "订单id："+orderId);
             return RestResponse.success(serviceResponse.getResult());