|
|
|
@@ -100,10 +100,11 @@ public class WxPayOrderController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); |
|
|
|
} |
|
|
|
|
|
|
|
return _create(orderIdStr,composeOrderType,user.getUserId(),getPayWay(),user.getAppId(),new PayExtraParam("openId",user.getOpenId()),request); |
|
|
|
return _create(orderIdStr,composeOrderType,user.getUserId(),getPayWay(),user.getAppId(),new PayExtraParam("openId",user.getOpenId()),true,request); |
|
|
|
} |
|
|
|
|
|
|
|
private ResultData _create(String orderIdStr,String composeOrderType,Long userId, EnumPayWay payWay,String appId,PayExtraParam parm,HttpServletRequest request) { |
|
|
|
private ResultData _create(String orderIdStr,String composeOrderType,Long userId, EnumPayWay payWay, |
|
|
|
String appId,PayExtraParam parm,boolean isCreatePay,HttpServletRequest request) { |
|
|
|
WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(userId,getFinalTenantId()); |
|
|
|
if ( null == wxCUserBasicInfo) { |
|
|
|
logger.error("会员用户不存在."+userId); |
|
|
|
@@ -128,7 +129,7 @@ public class WxPayOrderController extends BaseController { |
|
|
|
try { |
|
|
|
record.setIp(IPUtil.getIpAddr(request)); |
|
|
|
record.setComposeOrder(Integer.parseInt(composeOrderType)); |
|
|
|
return wxPayOrderService.createPayOrder(appInfo, wxCUserBasicInfo, record, payWay,parm); |
|
|
|
return wxPayOrderService.createPayOrder(appInfo, wxCUserBasicInfo, record, payWay,parm,isCreatePay); |
|
|
|
} catch (MallinkException e) { |
|
|
|
logger.error("payment wechat, order create error, req 2: " + record.toString() + ", e:" + e.getMessage(),e); |
|
|
|
return new ResultData(e.getErrorCode(), e.getMessage()); |
|
|
|
@@ -138,6 +139,30 @@ public class WxPayOrderController extends BaseController { |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
@RequestMapping(value = "/ttcreatev2", method = RequestMethod.POST) |
|
|
|
public ResultData _ttcreatev2(@RequestBody Map<String, String> paramMap, HttpServletRequest request) throws Exception { |
|
|
|
logger.info("/api/pay/create" + paramMap.toString()); |
|
|
|
String orderIdStr = paramMap.get("orderId"); |
|
|
|
if (StringUtils.isBlank(orderIdStr)) { |
|
|
|
logger.info("orderId不能为空: " + paramMap.toString()); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); |
|
|
|
} |
|
|
|
|
|
|
|
String composeOrderType = paramMap.get("composeOrderType"); |
|
|
|
if (StringUtils.isBlank(composeOrderType)) { |
|
|
|
logger.info("composeOrderType不能为空: " + paramMap.toString()); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "composeOrderType不能为空"); |
|
|
|
} |
|
|
|
|
|
|
|
CUser user = getCUser(); |
|
|
|
if (!user.basicInfoIs()) { |
|
|
|
logger.error("暂未成为会员,请授权手机号"); |
|
|
|
return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); |
|
|
|
} |
|
|
|
|
|
|
|
return _create(orderIdStr,composeOrderType,user.getUserId(),getPayWay(),user.getAppId(),new PayExtraParam("openId",user.getOpenId()),false,request); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation(value = "更新支付订单状态", notes = "{\"payOrderId\":\"string\",\"composeOrderId\":\"string\",\"status\":integer,\"reason\":\"string\"}") |
|
|
|
@PostMapping("/updatePayOrder") |
|
|
|
public ResultData updatePayOrder(@RequestBody Map<String, Object> paramMap) { |
|
|
|
|