From c88d1658a2b6b51ed1a81c3be3e9102b661970f3 Mon Sep 17 00:00:00 2001
From: luoxinwu <934743099@qq.com>
Date: 星期二, 05 三月 2024 09:42:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/haucheng_panzhihua' into haucheng_panzhihua
---
springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java | 5 ++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/UnionDoorUtil.java | 25 ++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/UnionDoorUtil.java | 24 ++++++++++++
springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionDoorApi.java | 34 +++++++++++++++++
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml | 8 +++-
springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java | 9 ++--
6 files changed, 97 insertions(+), 8 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionDoorApi.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionDoorApi.java
new file mode 100644
index 0000000..2283fab
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UnionDoorApi.java
@@ -0,0 +1,34 @@
+package com.panzhihua.applets.api;
+
+import com.panzhihua.applets.config.UnionDoorUtil;
+import com.panzhihua.common.model.vos.R;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+
+@RestController
+@RequestMapping("/unionDoor/")
+@Api(tags = {"户外劳工站接口"})
+public class UnionDoorApi {
+
+ @Resource
+ private UnionDoorUtil unionDoorUtil;
+
+
+ /**
+ * (二期)用户开门(通过电话)(主花城e+使用)
+ *
+ * @return 总工会户外劳共用户
+ */
+ @GetMapping("/openDoorByPhone")
+ @ApiOperation("(二期)用户开门(通过电话)(主花城e+使用)")
+ public R openDoorByPhone(@RequestParam(value = "qRCode") String qRCode, @RequestParam(value = "phone") String phone) throws Exception {
+ return unionDoorUtil.openDoorByPhone(qRCode, phone);
+ }
+
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/UnionDoorUtil.java b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/UnionDoorUtil.java
new file mode 100644
index 0000000..b7b9ea1
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/config/UnionDoorUtil.java
@@ -0,0 +1,25 @@
+package com.panzhihua.applets.config;
+
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.model.vos.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import static com.panzhihua.common.utlis.HttpClientUtil.httpGet;
+
+@Slf4j
+@Service
+public class UnionDoorUtil {
+
+
+ /**
+ * 户外劳工站
+ *
+ * @return token
+ * @throws Exception
+ */
+ public R openDoorByPhone(String qRCode,String phone) throws Exception {
+ String url = "https://userinner.pzhszgh.cn/unionOutdoor/unionUser/openDoorByPhone?qRCode="+qRCode+"&phone="+phone;
+ return JSONObject.parseObject(httpGet(url, null), R.class);
+ }
+}
\ No newline at end of file
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/UnionDoorUtil.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/UnionDoorUtil.java
new file mode 100644
index 0000000..d3678e2
--- /dev/null
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/util/UnionDoorUtil.java
@@ -0,0 +1,24 @@
+package com.panzhihua.service_community.util;
+
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.model.vos.R;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+import static com.panzhihua.common.utlis.HttpClientUtil.httpGet;
+
+@Slf4j
+@Service
+public class UnionDoorUtil {
+
+
+ /**
+ * 刷新token
+ *
+ * @return token
+ * @throws Exception
+ */
+ public R refreshToken(String qRCode,String phone) throws Exception {
+ String url = "https://userinner.pzhszgh.cn/unionOutdoor/unionUser/openDoorByPhone?qRCode+"+qRCode+"&phone="+phone;
+ return JSONObject.parseObject(httpGet(url, null), R.class);
+ }
+}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
index aa8f853..762e79e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/resources/mapper/ComActActivityMapper.xml
@@ -391,7 +391,9 @@
(SELECT responsibility FROM com_act_social_project casp WHERE a.project_id = casp.id) AS responsibilityName,
a.type,
a.party_member_max,
- a.topic_id
+ a.topic_id,
+ a.jinhui_coin_award,
+ a.jinhui_coin_punishment
FROM
com_act_activity a
LEFT JOIN sys_user u ON a.sponsor_id = u.user_id
@@ -431,7 +433,9 @@
ca.NAME AS communityName,
a.type,
a.party_member_max,
- a.topic_id
+ a.topic_id,
+ a.jinhui_coin_award,
+ a.jinhui_coin_punishment
FROM
com_act_activity a
LEFT JOIN sys_user u ON a.sponsor_id = u.user_id
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java
index 801c7ba..7525bc5 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/NewFightShoppingOrderServiceImpl.java
@@ -77,15 +77,14 @@
//判断是线上下单 还是商家线下下单 1线上 2线下
- if(StringUtils.equals("1",item.getOrderType()))
+ if(StringUtils.equals("2",item.getOrderType()))
{
- NewFightShopping goods=shoppingService.getDetails(item.getGoodsId());
- getMoney=Integer.valueOf(goods.getGoodPrice());
+ getMoney=Integer.valueOf(item.getPalyMoney());
}
else
{
- getMoney=Integer.valueOf(item.getPalyMoney());
-
+ NewFightShopping goods=shoppingService.getDetails(item.getGoodsId());
+ getMoney=Integer.valueOf(goods.getGoodPrice());
}
diff --git a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
index 6a5517f..854fef2 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/zuul/src/main/java/com/panzhihua/zuul/filters/JWTAuthenticationTokenFilter.java
@@ -94,6 +94,7 @@
boolean basicScreen = requestURI.contains("basicScreen");
boolean pageEasyPhotoAdminLC = requestURI.contains("pageEasyPhotoAdminLC");
boolean putmessage = requestURI.contains("putmessage");
+ boolean unionDoor = requestURI.contains("unionDoor");
// boolean bigscreen = requestURI.contains("/bigscreen/party");
// boolean pageworkguide = !requestURI.contains("workguide/pageworkguide");
// boolean detailworkguide = !requestURI.contains("workguide/detailworkguide");
@@ -105,7 +106,7 @@
if (login || doc || css || js || ui || swagger || ico || docs || error || refreshToken || useragreement || wxPay
// ||wxCgi||isShop||listadvertisement||noToken||bigscreen) {
|| wxCgi || isShop || listadvertisement || noToken || uuRepay || kaphtcha || uuPush || tfLogin || batteryActivityPayNotify
- || batteryPayNotify || wsPush || basicScreen || pageEasyPhotoAdminLC || union || putmessage)
+ || batteryPayNotify || wsPush || basicScreen || pageEasyPhotoAdminLC || union || putmessage || unionDoor)
{
if (union && !login ) {
String token;
@@ -342,6 +343,8 @@
noLoginUrl.add("/api/communitybackstage/comBatteryCommodityOrder/syncCloseOrder");
noLoginUrl.add("/api/applets/uu/getQRCode");
noLoginUrl.add("/api/huacheng-applets/uu/getQRCode");
+ noLoginUrl.add("/api/applets/unionDoor/openDoorByPhone");
+ noLoginUrl.add("/api/huacheng-applets/unionDoor/openDoorByPhone");
// noLoginUrl.add("/api/huacheng-union-applets/unionInspection/query");
// noLoginUrl.add("/api/huacheng-union-applets/unionInspection/add");
// noLoginUrl.add("/api/huacheng-union-applets/unionOutdoorLaborDynamic/page");
--
Gitblit v1.7.1