|
@@ -12,10 +12,13 @@ import com.miaxis.common.core.page.ResponsePageInfo;
|
|
import com.miaxis.common.exception.CustomException;
|
|
import com.miaxis.common.exception.CustomException;
|
|
import com.miaxis.common.utils.SecurityUtils;
|
|
import com.miaxis.common.utils.SecurityUtils;
|
|
import com.miaxis.common.utils.uuid.CommonUtils;
|
|
import com.miaxis.common.utils.uuid.CommonUtils;
|
|
|
|
+import com.miaxis.system.service.ISysDictDataService;
|
|
import com.miaxis.wx.domain.WxOrder;
|
|
import com.miaxis.wx.domain.WxOrder;
|
|
-import com.miaxis.wx.dto.*;
|
|
|
|
|
|
+import com.miaxis.wx.dto.WxOrderCreateDTO;
|
|
|
|
+import com.miaxis.wx.dto.WxOrderCreateFuluDTO;
|
|
|
|
+import com.miaxis.wx.dto.WxOrderCreatePhoneBillDTO;
|
|
|
|
+import com.miaxis.wx.dto.WxOrderListDTO;
|
|
import com.miaxis.wx.service.IWxOrderService;
|
|
import com.miaxis.wx.service.IWxOrderService;
|
|
-import com.miaxis.system.service.ISysDictDataService;
|
|
|
|
import io.swagger.annotations.*;
|
|
import io.swagger.annotations.*;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.RequiredArgsConstructor;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
import lombok.extern.slf4j.Slf4j;
|
|
@@ -32,7 +35,6 @@ import org.springframework.web.bind.annotation.*;
|
|
|
|
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.ByteArrayOutputStream;
|
|
import java.io.File;
|
|
import java.io.File;
|
|
-import java.io.IOException;
|
|
|
|
import java.security.PrivateKey;
|
|
import java.security.PrivateKey;
|
|
import java.security.Signature;
|
|
import java.security.Signature;
|
|
import java.util.Base64;
|
|
import java.util.Base64;
|
|
@@ -109,7 +111,7 @@ public class WxController extends BaseController {
|
|
//保存电影下单数据
|
|
//保存电影下单数据
|
|
wxOrderService.createPhoneBillOrder(order,wxOrderCreatePhoneBillDTO);
|
|
wxOrderService.createPhoneBillOrder(order,wxOrderCreatePhoneBillDTO);
|
|
wxOrderService.save(order);
|
|
wxOrderService.save(order);
|
|
- return Response.success(placeWxOrder(order, "视频会员"));
|
|
|
|
|
|
+ return Response.success(placeWxOrder(order, "活动-话费充值"));
|
|
|
|
|
|
|
|
|
|
}
|
|
}
|