|
|
|
@@ -5,14 +5,13 @@ import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.config.PayProperty; |
|
|
|
import com.iformall.domain.po.WxAppinfo; |
|
|
|
import com.iformall.domain.po.WxCUser; |
|
|
|
import com.iformall.domain.po.WxOrder; |
|
|
|
import com.iformall.domain.po.WxPayOrder; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.enums.EnumCouponType; |
|
|
|
import com.iformall.enums.EnumOrderStatus; |
|
|
|
import com.iformall.enums.EnumPayStatus; |
|
|
|
import com.iformall.enums.EnumPayWay; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.WxCouponService; |
|
|
|
import com.iformall.service.WxOrderService; |
|
|
|
import com.iformall.service.WxPayOrderService; |
|
|
|
import com.iformall.utils.IPUtil; |
|
|
|
@@ -44,6 +43,9 @@ public class WxPayOrderController extends BaseController { |
|
|
|
@Autowired |
|
|
|
private WxOrderService wxOrderService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxCouponService wxCouponService; |
|
|
|
|
|
|
|
@ApiOperation(value = "发起微信小程序支付订单", notes = "{\"orderId\":\"string\"}") |
|
|
|
@RequestMapping(value = "/create", method = RequestMethod.POST) |
|
|
|
public ResultData _create(@RequestBody Map<String, String> paramMap, HttpServletRequest request) throws Exception { |
|
|
|
@@ -124,7 +126,8 @@ public class WxPayOrderController extends BaseController { |
|
|
|
payOrder = wxPayOrderService.getById(payOrderId); |
|
|
|
if(payOrder.getPayOrderStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { |
|
|
|
order = wxOrderService.getById(orderId); |
|
|
|
if (!order.getOrderGroupId().equals(0L)) { |
|
|
|
WxCoupon coupon = wxCouponService.getById(order.getProductId()); |
|
|
|
if (coupon.getType().equals(EnumCouponType.COUPON_GROUP.getCode())) { |
|
|
|
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); |
|
|
|
wxOrderService.saveOrUpdate(order); |
|
|
|
} |
|
|
|
|