|
|
@ -42,6 +42,7 @@ import org.springframework.web.bind.annotation.ResponseBody; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import javax.annotation.Resource; |
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import javax.servlet.http.HttpServletRequest; |
|
|
|
import java.math.BigDecimal; |
|
|
|
import java.math.BigDecimal; |
|
|
|
|
|
|
|
import java.util.Date; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.SortedMap; |
|
|
|
import java.util.SortedMap; |
|
|
@ -122,6 +123,10 @@ public class OrderPayController { |
|
|
|
log.error("wxPay ERROR", "订单不处于待支付状态"); |
|
|
|
log.error("wxPay ERROR", "订单不处于待支付状态"); |
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.ORDER_NO_STAY_PAY, ""); |
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.ORDER_NO_STAY_PAY, ""); |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
if (DateUtil.getSecondDiff(order.getCreateTime(), DateUtil.addDate(order.getCreateTime(), 10)) < 10) { |
|
|
|
|
|
|
|
log.error("wxPay ERROR", "订单待支付时间小于10秒,请重新下单支付"); |
|
|
|
|
|
|
|
throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "订单待支付时间小于10秒,请重新下单支付"); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Integer openIdType = body.getInteger("openIdType"); |
|
|
|
Integer openIdType = body.getInteger("openIdType"); |
|
|
|
// 是否分账
|
|
|
|
// 是否分账
|
|
|
|