|
|
|
@@ -2,6 +2,8 @@ package com.iformall.controller; |
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.annotation.AuthIgnore; |
|
|
|
import com.iformall.annotation.TenantIgnore; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.IdWorker; |
|
|
|
import com.iformall.common.Result; |
|
|
|
@@ -10,6 +12,7 @@ import com.iformall.domain.dto.OrderComposeSaveDto; |
|
|
|
import com.iformall.domain.dto.OrderSaveDto; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.po.base.BaseEntity; |
|
|
|
import com.iformall.domain.po.base.TenantEntity; |
|
|
|
import com.iformall.domain.vo.WxCouponCVo; |
|
|
|
import com.iformall.domain.vo.WxOrderCouponPressVo; |
|
|
|
import com.iformall.domain.vo.WxOrderCouponVo; |
|
|
|
@@ -18,7 +21,9 @@ import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.service.order.OrderFactory; |
|
|
|
import com.iformall.service.order.entity.WxComposeOrder; |
|
|
|
import com.iformall.service.pay.entity.PayExtraParam; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
import com.iformall.utils.IPUtil; |
|
|
|
import com.iformall.utils.RedisLock; |
|
|
|
|
|
|
|
import io.swagger.annotations.Api; |
|
|
|
@@ -675,4 +680,39 @@ public class WxOrderController extends BaseController { |
|
|
|
return new ResultData(refundOrder); |
|
|
|
} |
|
|
|
|
|
|
|
// @AuthIgnore |
|
|
|
// @TenantIgnore |
|
|
|
// @ApiOperation("") |
|
|
|
// @GetMapping("getgettest") |
|
|
|
// public ResultData getgettest() { |
|
|
|
// // 下订单 |
|
|
|
// OrderSaveDto orderSaveDto = new OrderSaveDto(); |
|
|
|
// orderSaveDto.setCouponChannelId(695062636554543104l); |
|
|
|
// |
|
|
|
// List<OrderComposeSaveDto> list = new ArrayList<>(); |
|
|
|
// OrderComposeSaveDto dto = new OrderComposeSaveDto(); |
|
|
|
// dto.setSignleOrder(orderSaveDto); |
|
|
|
// dto.setCount(1); |
|
|
|
// list.add(dto); |
|
|
|
// |
|
|
|
// TenantEntity tenantEntity = new TenantEntity(); |
|
|
|
// tenantEntity.setTenantId("1028"); |
|
|
|
// Long userId = 678037072832552960l; |
|
|
|
// String openid = "2d8d04fd-bfbe-4c32-90c6-6831861c9852"; |
|
|
|
// ResultData resultData = wxOrderService.composeSaveOrder(false, EnumComposeOrder.SINGLE, list, userId, EnumPayWay.PAY_WAY_TT, tenantEntity); |
|
|
|
// WxComposeOrder data = (WxComposeOrder) resultData.data; |
|
|
|
// |
|
|
|
// WxAppinfo appInfo = wxAppinfoService.getCAppInfo(tenantEntity, EnumAppPlat.TOUTIAO); |
|
|
|
// WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(userId,tenantEntity.getFinalTenantId()); |
|
|
|
// |
|
|
|
// WxPayOrder record = new WxPayOrder(); |
|
|
|
// record.setOrderId(data.getMainOrderId()); |
|
|
|
// record.setOpenId(openid); |
|
|
|
// record.setComposeOrder(data.getComposeOrderType()); |
|
|
|
// |
|
|
|
// ResultData openId = wxPayOrderService.createPayOrder(appInfo, wxCUserBasicInfo, record, EnumPayWay.PAY_WAY_TT, new PayExtraParam("openId", openid)); |
|
|
|
// |
|
|
|
// return openId; |
|
|
|
// } |
|
|
|
|
|
|
|
} |