|
|
|
@@ -4,13 +4,12 @@ import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
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.EnumCreditLockedStatus; |
|
|
|
import com.iformall.enums.EnumPayStatus; |
|
|
|
import com.iformall.enums.EnumPayWay; |
|
|
|
import com.iformall.exception.MallinkException; |
|
|
|
import com.iformall.service.WxCUserBasicInfoService; |
|
|
|
import com.iformall.service.WxOrderService; |
|
|
|
import com.iformall.service.WxPayOrderService; |
|
|
|
import com.iformall.utils.IPUtil; |
|
|
|
@@ -39,6 +38,9 @@ public class WxPayOrderController extends BaseController { |
|
|
|
@Autowired |
|
|
|
private WxOrderService wxOrderService; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
private WxCUserBasicInfoService wxCUserBasicInfoService; |
|
|
|
|
|
|
|
@ApiOperation(value = "发起微信小程序支付订单", notes = "{\"orderId\":\"string\"}") |
|
|
|
@RequestMapping(value = "/create", method = RequestMethod.POST) |
|
|
|
public ResultData _create(@RequestBody Map<String, String> paramMap, HttpServletRequest request) throws Exception { |
|
|
|
@@ -50,6 +52,10 @@ public class WxPayOrderController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
WxCUser user = getUser(); |
|
|
|
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getId()); |
|
|
|
if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { |
|
|
|
return new ResultData(ErrorCode.MEMBER_IS_LOCKED); |
|
|
|
} |
|
|
|
WxAppinfo appInfo = getAppInfo(user.getAppId()); |
|
|
|
if(appInfo == null) { |
|
|
|
return new ResultData(ErrorCode.APP_ID_NOT_FOUND); |
|
|
|
@@ -149,7 +155,9 @@ public class WxPayOrderController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
public ResultData list(@ModelAttribute WxPayOrder wxPayOrder, Integer pageNum, Integer pageSize) { |
|
|
|
if (null == wxPayOrder) wxPayOrder = new WxPayOrder(); |
|
|
|
if (null == wxPayOrder) { |
|
|
|
wxPayOrder = new WxPayOrder(); |
|
|
|
} |
|
|
|
final PageInfo<WxPayOrder> page = wxPayOrderService.listAsPage(wxPayOrder, pageNum, pageSize); |
|
|
|
return new ResultData(page); |
|
|
|
} |
|
|
|
|