|
|
|
@@ -2,6 +2,7 @@ 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.common.ErrorCode; |
|
|
|
import com.iformall.common.IdWorker; |
|
|
|
import com.iformall.common.Result; |
|
|
|
@@ -34,10 +35,7 @@ import org.springframework.beans.factory.annotation.Qualifier; |
|
|
|
import org.springframework.data.redis.core.RedisTemplate; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import java.util.ArrayList; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.*; |
|
|
|
|
|
|
|
@RestController |
|
|
|
@RequestMapping("/api/order/") |
|
|
|
@@ -138,27 +136,34 @@ public class WxOrderController extends BaseController { |
|
|
|
list.add(dto); |
|
|
|
return wxOrderService.composeSaveOrder(false,EnumComposeOrder.SINGLE,list,memberId,getPayWay(),getTenantInfo()); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@AuthIgnore |
|
|
|
@ApiOperation(value = "抖音支付2.0与下单回调推送订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}") |
|
|
|
@PostMapping("douyinPushOrder") |
|
|
|
public ResultData douyinPushOrder(@RequestBody Map param) { |
|
|
|
public Map<String,Object> douyinPushOrder(@RequestBody Map param) { |
|
|
|
logger.info("save douyinPushOrder:"+param); |
|
|
|
Long memberId; |
|
|
|
try { |
|
|
|
memberId = getMemberId(); |
|
|
|
} catch (Exception e) { |
|
|
|
return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
} |
|
|
|
|
|
|
|
List<PlatPushOrderSaveDto> list = new ArrayList<>(); |
|
|
|
PlatPushOrderSaveDto dto = new PlatPushOrderSaveDto(); |
|
|
|
/** |
|
|
|
* TODO 从抖音推送的订单中取信息,每个订单里面有extParam,用来放第三方平台匹配的参数信息 |
|
|
|
* 注意,wx_batch_order中要存allExtParam, wx_order,wx_coupon_order中存储每个订单的参数信息,需要自己根据总参数信息进行拆分 |
|
|
|
*/ |
|
|
|
list.add(dto); |
|
|
|
String allExtParam = "[]"; |
|
|
|
return wxOrderService.platPushSaveOrder(false,EnumComposeOrder.ONE_NUMBER_ORDER_BATCH,allExtParam,list,memberId,getPayWay(),getTenantInfo()); |
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap(); |
|
|
|
map.put("err_no",1000); |
|
|
|
map.put("err_tips","库存不足"); |
|
|
|
return map; |
|
|
|
|
|
|
|
// Long memberId; |
|
|
|
// try { |
|
|
|
// memberId = getMemberId(); |
|
|
|
// } catch (Exception e) { |
|
|
|
// return new ResultData(Result.ERROR,e.getMessage()); |
|
|
|
// } |
|
|
|
// |
|
|
|
// List<PlatPushOrderSaveDto> list = new ArrayList<>(); |
|
|
|
// PlatPushOrderSaveDto dto = new PlatPushOrderSaveDto(); |
|
|
|
// /** |
|
|
|
// * TODO 从抖音推送的订单中取信息,每个订单里面有extParam,用来放第三方平台匹配的参数信息 |
|
|
|
// * 注意,wx_batch_order中要存allExtParam, wx_order,wx_coupon_order中存储每个订单的参数信息,需要自己根据总参数信息进行拆分 |
|
|
|
// */ |
|
|
|
// list.add(dto); |
|
|
|
// String allExtParam = "[]"; |
|
|
|
// return wxOrderService.platPushSaveOrder(false,EnumComposeOrder.ONE_NUMBER_ORDER_BATCH,allExtParam,list,memberId,getPayWay(),getTenantInfo()); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|