|
|
|
@@ -6,11 +6,13 @@ import com.iformall.annotation.RedisCache; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.vo.WxCouponOrderCVo; |
|
|
|
import com.iformall.enums.*; |
|
|
|
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.utils.DateUtils; |
|
|
|
import com.iformall.utils.IPUtil; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
@@ -24,6 +26,7 @@ import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.util.Date; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.Map; |
|
|
|
|
|
|
|
@@ -335,6 +338,17 @@ public class WxMicroPayController extends BaseController { |
|
|
|
// 获取C用户 |
|
|
|
WxCUserBasicInfo cUser = null; |
|
|
|
if (StringUtils.isNotBlank(cUserIdStr)) { |
|
|
|
String _memberId = WxCouponOrderCVo.getDecodeExpiredCouponOrderId(cUserIdStr); |
|
|
|
if (_memberId.contains(WxCouponOrderCVo.arg)) { |
|
|
|
String[] decodeids = _memberId.split(WxCouponOrderCVo.arg); |
|
|
|
cUserIdStr = decodeids[0]; |
|
|
|
String expiredtimeStr = decodeids[1]; |
|
|
|
Date expiredtime = DateUtils.string2Date(expiredtimeStr).getTime(); |
|
|
|
if (expiredtime.before(new Date())) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(),"码已失效,请更新二维码后重试"); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
Long cUserId = 0L; |
|
|
|
try { |
|
|
|
cUserId = Long.valueOf(cUserIdStr); |
|
|
|
|