Commit 802cf201 by 陶光胜

通知详情修改

parent a1ff5b93
......@@ -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, Integer userId);
ServiceResponse<BillingPayInfoDTO> paySmsPackageOrder(Integer enterpriseId, Integer orderId, Integer payType, String authCode, String userName);
/**
* 条件分页查询订单状态
......
......@@ -99,7 +99,7 @@ public class BillingOrderApiServcImpl implements BillingOrderApiService {
@Override
@Transactional
public ServiceResponse<BillingPayInfoDTO> paySmsPackageOrder(Integer enterpriseId, Integer orderId, Integer payType,
String authCode, Integer userId){
String authCode, String userName){
TabBillingOrder order = this.billingOrderService.getOrderById(orderId);
OutPayDTO outPayDTO = new OutPayDTO();
outPayDTO.setEnterpriseId(enterpriseId);
......@@ -118,7 +118,7 @@ public class BillingOrderApiServcImpl implements BillingOrderApiService {
outPayDTO.setOrderSerialNumber(order.getSerialNumber());
outPayDTO.setPayType(payType);
outPayDTO.setAuthCode(authCode);
outPayDTO.setInitiatorUser(userId);
outPayDTO.setInitiatorName(userName);
ServiceResponse<BillingPayInfoDTO> response = this.billingPayInfoApiService.savePrePayInfo(outPayDTO);
if(response.isSuccess()){
Integer payInfoId = response.getResult().getPayInfoId();
......
......@@ -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, UserDetailUtils.getUserDetail().getUserId());
paySmsPackageOrder(enterpriseId, orderId, payType, authCode, UserDetailUtils.getUserDetail().getUserInfo().getUserName());
if(serviceResponse.isSuccess()){
LogUtils.createLog("套餐包支付", "订单id:"+orderId);
return RestResponse.success(serviceResponse.getResult());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment