|
|
|
@@ -5,9 +5,10 @@ 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.*; |
|
|
|
import com.iformall.enums.EnumCouponType; |
|
|
|
import com.iformall.enums.EnumOrderStatus; |
|
|
|
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.enums.EnumPayStatus; |
|
|
|
import com.iformall.enums.EnumPayWay; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
@@ -126,11 +127,6 @@ public class WxPayOrderController extends BaseController { |
|
|
|
payOrder = wxPayOrderService.getById(payOrderId); |
|
|
|
if(payOrder.getPayOrderStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { |
|
|
|
order = wxOrderService.getById(orderId); |
|
|
|
WxCoupon coupon = wxCouponService.getById(order.getProductId()); |
|
|
|
if (coupon.getType().equals(EnumCouponType.COUPON_GROUP.getCode())) { |
|
|
|
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); |
|
|
|
wxOrderService.saveOrUpdate(order); |
|
|
|
} |
|
|
|
return new ResultData(Result.SUCCESS, "支付状态更新成功", order); |
|
|
|
} else { |
|
|
|
return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付未状态,请等待!!"); |
|
|
|
|