From 26cd8c7b2bc7a725a3de28d3ed883a6f54da84f1 Mon Sep 17 00:00:00 2001
From: DESKTOP-71BH0QO\L、ming <172680469@qq.com>
Date: 星期二, 20 四月 2021 16:59:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java | 21 +++++++++++++++++++++
1 files changed, 21 insertions(+), 0 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
index 4d5f529..0f28c5c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/ShopApi.java
@@ -1,17 +1,24 @@
package com.panzhihua.applets.api;
+import com.panzhihua.applets.config.WxMaProperties;
import com.panzhihua.common.controller.BaseController;
import com.panzhihua.common.model.dtos.shop.*;
import com.panzhihua.common.model.vos.LoginUserInfoVO;
import com.panzhihua.common.model.vos.R;
import com.panzhihua.common.model.vos.shop.*;
import com.panzhihua.common.service.community.CommunityService;
+import com.panzhihua.common.utlis.PayUtil;
import io.swagger.annotations.*;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.io.PrintWriter;
import java.util.List;
+import java.util.Map;
/**
* @auther lyq
@@ -26,6 +33,8 @@
@Resource
private CommunityService communityService;
+ @Resource
+ private WxMaProperties properties;
@ApiOperation(value = "分页查询店铺" , response = PageShopStoreVO.class)
@PostMapping("pageshopstore")
@@ -148,6 +157,7 @@
}
orderCreateDTO.setUserId(loginUserInfo.getUserId());
orderCreateDTO.setPhone(loginUserInfo.getPhone());
+ orderCreateDTO.setOpenId(loginUserInfo.getOpenid());
return communityService.orderCreate(orderCreateDTO);
}
@@ -206,5 +216,16 @@
return communityService.orderStatistics(loginUserInfo.getUserId());
}
+ @ApiOperation(value = "小程序微信调起支付")
+ @PostMapping("wxpay")
+ public R wxPay(@RequestBody OrderPayDTO orderPayDTO){
+ LoginUserInfoVO loginUserInfo = this.getLoginUserInfo();
+ if(loginUserInfo == null){
+ return R.fail("请重新登陆");
+ }
+ orderPayDTO.setOpenId(loginUserInfo.getOpenid());
+ return communityService.wxPay(orderPayDTO);
+ }
+
}
--
Gitblit v1.7.1