|
|
@@ -1,6 +1,7 @@ |
|
|
package com.iformall.controller; |
|
|
package com.iformall.controller; |
|
|
|
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; |
|
|
|
|
|
import com.github.binarywang.wxpay.bean.ecommerce.SignatureHeader; |
|
|
import com.github.pagehelper.PageInfo; |
|
|
import com.github.pagehelper.PageInfo; |
|
|
import com.iformall.annotation.AuthIgnore; |
|
|
import com.iformall.annotation.AuthIgnore; |
|
|
import com.iformall.common.ErrorCode; |
|
|
import com.iformall.common.ErrorCode; |
|
|
@@ -17,6 +18,7 @@ import com.iformall.domain.vo.WxOrderCouponPressVo; |
|
|
import com.iformall.domain.vo.WxOrderCouponVo; |
|
|
import com.iformall.domain.vo.WxOrderCouponVo; |
|
|
import com.iformall.enums.*; |
|
|
import com.iformall.enums.*; |
|
|
import com.iformall.exception.MallinkException; |
|
|
import com.iformall.exception.MallinkException; |
|
|
|
|
|
import com.iformall.interceptor.BodyReaderHttpServletRequestWrapper; |
|
|
import com.iformall.service.*; |
|
|
import com.iformall.service.*; |
|
|
import com.iformall.service.order.OrderFactory; |
|
|
import com.iformall.service.order.OrderFactory; |
|
|
import com.iformall.service.order.entity.WxComposeOrder; |
|
|
import com.iformall.service.order.entity.WxComposeOrder; |
|
|
@@ -35,6 +37,7 @@ import org.springframework.beans.factory.annotation.Qualifier; |
|
|
import org.springframework.data.redis.core.RedisTemplate; |
|
|
import org.springframework.data.redis.core.RedisTemplate; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
import java.util.*; |
|
|
import java.util.*; |
|
|
|
|
|
|
|
|
@RestController |
|
|
@RestController |
|
|
@@ -140,8 +143,16 @@ public class WxOrderController extends BaseController { |
|
|
@AuthIgnore |
|
|
@AuthIgnore |
|
|
@ApiOperation(value = "抖音支付2.0与下单回调推送订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}") |
|
|
@ApiOperation(value = "抖音支付2.0与下单回调推送订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}") |
|
|
@PostMapping("douyinPushOrder") |
|
|
@PostMapping("douyinPushOrder") |
|
|
public Map<String,Object> douyinPushOrder(@RequestBody Map param) { |
|
|
|
|
|
logger.info("save douyinPushOrder:"+param); |
|
|
|
|
|
|
|
|
public Map<String,Object> douyinPushOrder(HttpServletRequest request) { |
|
|
|
|
|
SignatureHeader header = new SignatureHeader(); |
|
|
|
|
|
header.setTimeStamp(request.getHeader("Byte-Timestamp")); |
|
|
|
|
|
header.setNonce(request.getHeader("Byte-Nonce-Str")); |
|
|
|
|
|
header.setSigned(request.getHeader("Byte-Signature")); |
|
|
|
|
|
|
|
|
|
|
|
logger.info("支付2.0预下单回调---header{}"+header.toString()); |
|
|
|
|
|
|
|
|
|
|
|
String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); |
|
|
|
|
|
logger.info("支付2.0预下单回调---body{}"+body); |
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap(); |
|
|
Map<String, Object> map = new HashMap(); |
|
|
map.put("err_no",1000); |
|
|
map.put("err_no",1000); |
|
|
@@ -705,4 +716,25 @@ public class WxOrderController extends BaseController { |
|
|
return new ResultData(refundOrder); |
|
|
return new ResultData(refundOrder); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@AuthIgnore |
|
|
|
|
|
@ApiOperation(value = "抖音支付2.0与退款回调推送订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}") |
|
|
|
|
|
@PostMapping("douyinRefundOrder") |
|
|
|
|
|
public Map<String,Object> douyinRefundOrder(HttpServletRequest request) { |
|
|
|
|
|
SignatureHeader header = new SignatureHeader(); |
|
|
|
|
|
header.setTimeStamp(request.getHeader("Byte-Timestamp")); |
|
|
|
|
|
header.setNonce(request.getHeader("Byte-Nonce-Str")); |
|
|
|
|
|
header.setSigned(request.getHeader("Byte-Signature")); |
|
|
|
|
|
|
|
|
|
|
|
logger.info("支付2.0预下单回调---header{}"+header.toString()); |
|
|
|
|
|
|
|
|
|
|
|
String body = ((BodyReaderHttpServletRequestWrapper) request).getBody(); |
|
|
|
|
|
logger.info("支付2.0预下单回调---body{}"+body); |
|
|
|
|
|
|
|
|
|
|
|
Map<String, Object> map = new HashMap(); |
|
|
|
|
|
map.put("err_no",1001); |
|
|
|
|
|
map.put("err_tips","未找到支付信息"); |
|
|
|
|
|
return map; |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
} |
|
|
} |