渠道支付订单增加openid接口

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/TicketBoxMgrController.java

@@ -119,6 +119,7 @@ public class TicketBoxMgrController extends BaseApiController {
 	 * 查看盲票详情
 	 */
 	@PostMapping("/detail")
+	@PreAuthorize("@ss.hasPermi('business:ticket:query')")
 	@ApiOperation(value = "查看盲票详情" , notes = "根据盲票组ID，获取盲票信息")
 	public AjaxResult getInfo(@RequestBody TicketBoxParam param) {
 		if (com.qs.mp.common.utils.StringUtils.isBlank(param.getBoxId())) {

mp-admin/src/main/java/com/qs/mp/web/controller/api/channel/mall/ChannelOrderController.java

@@ -258,13 +258,19 @@ public class ChannelOrderController extends BaseApiController {
   public AjaxResult pay(@Valid @RequestBody OrderPayParam param) {
     Long userId = SecurityUtils.getLoginUser().getUserId();
     SysUser sysUser = sysUserService.selectUserById(userId);
-    if (StringUtils.isBlank(sysUser.getChannelOpenId())) {
+    String channelOpenId = "";
+    if (StringUtils.isNotBlank(param.getOpenId())) {
+      channelOpenId = param.getOpenId();
+    } else {
+      channelOpenId = sysUser.getChannelOpenId();
+    }
+    if (StringUtils.isBlank(channelOpenId)) {
       return AjaxResult.error(ErrorCodeEnum.ERROR_CODE_1005);
     }
     ChannelOrder channelOrder = channelOrderService.getById(param.getOrderId());
     JSONObject jsonObject;
     try {
-      jsonObject = walletService.pay(BizTypeEnum.CHANNEL_ORDER, param.getOrderId(), sysUser.getChannelOpenId(), channelOrder.getPayAmt());
+      jsonObject = walletService.pay(BizTypeEnum.CHANNEL_ORDER, param.getOrderId(), channelOpenId, channelOrder.getPayAmt());
     }catch (ServiceException e) {
       LogUtil.error(logger, e, "根据经销商采购订单创建支付单失败。userId:{0},orderId:{1}", new Object[]{userId, param.getOrderId()});
       return AjaxResult.error(e.getMessage());

mp-admin/src/main/java/com/qs/mp/web/controller/api/common/UserController.java

@@ -171,7 +171,9 @@ public class UserController extends BaseApiController {
       LogUtil.error(logger,"用户微信授权异常");
       return error("用户微信授权异常");
     }
-    return success("微信授权成功");
+    JSONObject rst = new JSONObject();
+    rst.put("openId", openId);
+    return success(rst);
   }
 
 

mp-service/src/main/java/com/qs/mp/channel/domain/param/OrderPayParam.java

@@ -17,4 +17,8 @@ public class OrderPayParam {
 	@NotNull(message = "支付方式不能为空")
 	@ApiModelProperty(value = "支付方式",required=true)
 	private Integer payType;
+
+
+	@ApiModelProperty(value = "用户openID",required=true)
+	private String openId;
 }