Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
gogirl-miniapp-backend
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
huluobin
gogirl-miniapp-backend
Commits
076069ca
Commit
076069ca
authored
Mar 20, 2020
by
huluobin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update
parent
59a09478
Show whitespace changes
Inline
Side-by-side
Showing
25 changed files
with
108 additions
and
122 deletions
+108
-122
MallOrderPayServiceImpl.java
.../application/order/mall/impl/MallOrderPayServiceImpl.java
+2
-2
MallRefundOrderServiceImpl.java
...plication/order/mall/impl/MallRefundOrderServiceImpl.java
+2
-2
ChargeOrderServiceImpl.java
...application/order/member/impl/ChargeOrderServiceImpl.java
+1
-1
PayQryServiceImpl.java
...ogirl/application/order/serve/impl/PayQryServiceImpl.java
+1
-1
PayServiceImpl.java
...m/gogirl/application/order/serve/impl/PayServiceImpl.java
+1
-1
ScheduleManageServiceImpl.java
...plication/order/serve/impl/ScheduleManageServiceImpl.java
+1
-1
AccessTokenService.java
...a/com/gogirl/application/xcx/impl/AccessTokenService.java
+1
-1
QRCodeServiceImpl.java
...va/com/gogirl/application/xcx/impl/QRCodeServiceImpl.java
+1
-1
WechatServiceImpl.java
...va/com/gogirl/application/xcx/impl/WechatServiceImpl.java
+1
-1
CacheConfig.java
...in/java/com/gogirl/infrastructure/config/CacheConfig.java
+0
-89
MvcInterceptorConfig.java
...om/gogirl/infrastructure/config/MvcInterceptorConfig.java
+63
-0
WxMaConfiguration.java
...a/com/gogirl/infrastructure/config/WxMaConfiguration.java
+1
-0
WxPayConfiguration.java
.../com/gogirl/infrastructure/config/WxPayConfiguration.java
+2
-1
GogirlProperties.java
...girl/infrastructure/config/property/GogirlProperties.java
+1
-1
WxMaProperties.java
...gogirl/infrastructure/config/property/WxMaProperties.java
+1
-1
WxPayProperties.java
...ogirl/infrastructure/config/property/WxPayProperties.java
+3
-2
WxProperties.java
...m/gogirl/infrastructure/config/property/WxProperties.java
+13
-2
AuthHandlerInterceptor.java
...rl/infrastructure/interceptor/AuthHandlerInterceptor.java
+0
-1
LoginHandlerInterceptor.java
...l/infrastructure/interceptor/LoginHandlerInterceptor.java
+6
-7
Schedule.java
...ain/java/com/gogirl/infrastructure/schedule/Schedule.java
+1
-1
SubscribeServiceImpl.java
...l/infrastructure/subscribe/impl/SubscribeServiceImpl.java
+1
-1
MallOrderPayController.java
.../gogirl/interfaces/order/mall/MallOrderPayController.java
+2
-2
TimesCardController.java
.../java/com/gogirl/interfaces/user/TimesCardController.java
+1
-1
PayController.java
src/main/java/com/gogirl/interfaces/xcx/PayController.java
+1
-1
XcxController.java
src/main/java/com/gogirl/interfaces/xcx/XcxController.java
+1
-1
No files found.
src/main/java/com/gogirl/application/order/mall/impl/MallOrderPayServiceImpl.java
View file @
076069ca
...
...
@@ -17,8 +17,8 @@ import com.gogirl.domain.user.customer.CustomerMessage;
import
com.gogirl.infrastructure.common.exception.RRException
;
import
com.gogirl.infrastructure.common.util.JsonUtilByFsJson
;
import
com.gogirl.infrastructure.common.util.ListUtil
;
import
com.gogirl.infrastructure.config.GogirlProperties
;
import
com.gogirl.infrastructure.config.WxProperties
;
import
com.gogirl.infrastructure.config.
property.
GogirlProperties
;
import
com.gogirl.infrastructure.config.
property.
WxProperties
;
import
com.gogirl.infrastructure.feign.wx.WxPayControllerFeign
;
import
com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper
;
import
com.gogirl.infrastructure.mapper.user.customer.CustomerBalanceRecordMapper
;
...
...
src/main/java/com/gogirl/application/order/mall/impl/MallRefundOrderServiceImpl.java
View file @
076069ca
...
...
@@ -15,8 +15,8 @@ import com.gogirl.domain.order.mall.MallRefundOrder;
import
com.gogirl.domain.order.mall.MallRefundOrderDetail
;
import
com.gogirl.domain.user.customer.Customer
;
import
com.gogirl.infrastructure.common.exception.RRException
;
import
com.gogirl.infrastructure.config.GogirlProperties
;
import
com.gogirl.infrastructure.config.WxProperties
;
import
com.gogirl.infrastructure.config.
property.
GogirlProperties
;
import
com.gogirl.infrastructure.config.
property.
WxProperties
;
import
com.gogirl.infrastructure.feign.wx.WxPayControllerFeign
;
import
com.gogirl.infrastructure.mapper.order.mall.MallRefundOrderMapper
;
import
com.gogirl.infrastructure.mapper.user.customer.CustomerMapper
;
...
...
src/main/java/com/gogirl/application/order/member/impl/ChargeOrderServiceImpl.java
View file @
076069ca
...
...
@@ -19,7 +19,7 @@ import com.gogirl.domain.user.customer.CustomerBalance;
import
com.gogirl.domain.user.customer.CustomerBalanceRecord
;
import
com.gogirl.domain.xcx.GogirlToken
;
import
com.gogirl.infrastructure.common.exception.RRException
;
import
com.gogirl.infrastructure.config.GogirlProperties
;
import
com.gogirl.infrastructure.config.
property.
GogirlProperties
;
import
com.gogirl.infrastructure.feign.wx.WxPayControllerFeign
;
import
com.gogirl.infrastructure.mapper.market.discount.DiscountConfigMapper
;
import
com.gogirl.infrastructure.mapper.order.member.ChargeOrderMapper
;
...
...
src/main/java/com/gogirl/application/order/serve/impl/PayQryServiceImpl.java
View file @
076069ca
...
...
@@ -9,7 +9,7 @@
//import com.gogirl.domain.order.serve.OrderManage;
//import com.gogirl.domain.user.customer.CustomerBalance;
//import com.gogirl.infrastructure.common.exception.RRException;
//import com.gogirl.infrastructure.config.GogirlProperties;
//import com.gogirl.infrastructure.config.
property.
GogirlProperties;
//import com.gogirl.infrastructure.feign.wx.WxPayControllerFeign;
//import com.gogirl.infrastructure.mapper.user.customer.CustomerBalanceMapper;
//import com.gogirl.shared.member.order.command.BalanceWxPayQuery;
...
...
src/main/java/com/gogirl/application/order/serve/impl/PayServiceImpl.java
View file @
076069ca
...
...
@@ -14,7 +14,7 @@ import com.gogirl.domain.user.customer.CustomerBalance;
import
com.gogirl.infrastructure.common.exception.RRException
;
import
com.gogirl.infrastructure.common.util.JsonUtilByFsJson
;
import
com.gogirl.infrastructure.common.util.RandomUtil
;
import
com.gogirl.infrastructure.config.GogirlProperties
;
import
com.gogirl.infrastructure.config.
property.
GogirlProperties
;
import
com.gogirl.infrastructure.feign.wx.WxPayControllerFeign
;
import
com.gogirl.infrastructure.mapper.market.discount.DiscountConfigMapper
;
import
com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper
;
...
...
src/main/java/com/gogirl/application/order/serve/impl/ScheduleManageServiceImpl.java
View file @
076069ca
...
...
@@ -30,7 +30,7 @@ import com.gogirl.infrastructure.common.exception.RRException;
import
com.gogirl.infrastructure.common.util.CloneUtil
;
import
com.gogirl.infrastructure.common.util.ListUtil
;
import
com.gogirl.infrastructure.common.util.StringUtils
;
import
com.gogirl.infrastructure.config.GogirlProperties
;
import
com.gogirl.infrastructure.config.
property.
GogirlProperties
;
import
com.gogirl.infrastructure.mapper.market.discount.LeisureDiscountConfigMapper
;
import
com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper
;
import
com.gogirl.infrastructure.mapper.order.serve.ScheduleManageMapper
;
...
...
src/main/java/com/gogirl/application/xcx/impl/AccessTokenService.java
View file @
076069ca
package
com
.
gogirl
.
application
.
xcx
.
impl
;
import
com.gogirl.infrastructure.config.WxProperties
;
import
com.gogirl.infrastructure.config.
property.
WxProperties
;
import
lombok.AllArgsConstructor
;
import
lombok.extern.slf4j.Slf4j
;
import
net.sf.json.JSONObject
;
...
...
src/main/java/com/gogirl/application/xcx/impl/QRCodeServiceImpl.java
View file @
076069ca
...
...
@@ -2,7 +2,7 @@ package com.gogirl.application.xcx.impl;
import
com.github.binarywang.utils.qrcode.MatrixToImageWriter
;
import
com.gogirl.application.xcx.QRCodeService
;
import
com.gogirl.infrastructure.config.GogirlProperties
;
import
com.gogirl.infrastructure.config.
property.
GogirlProperties
;
import
com.gogirl.infrastructure.util.ImageUtil
;
import
com.google.zxing.BarcodeFormat
;
import
com.google.zxing.common.BitMatrix
;
...
...
src/main/java/com/gogirl/application/xcx/impl/WechatServiceImpl.java
View file @
076069ca
...
...
@@ -3,7 +3,7 @@ package com.gogirl.application.xcx.impl;
import
com.gogirl.application.xcx.WechatService
;
import
com.gogirl.infrastructure.common.util.JsonUtilByFsJson
;
import
com.gogirl.infrastructure.config.WxProperties
;
import
com.gogirl.infrastructure.config.
property.
WxProperties
;
import
com.gogirl.infrastructure.constant.WxUrlType
;
import
com.gogirl.shared.member.wx.query.dto.Code2SessionResult
;
import
lombok.AllArgsConstructor
;
...
...
src/main/java/com/gogirl/infrastructure/config/CacheConfig.java
deleted
100644 → 0
View file @
59a09478
//package com.gogirl.infrastructure.config;
//
//import com.fasterxml.jackson.annotation.JsonAutoDetect;
//import com.fasterxml.jackson.annotation.PropertyAccessor;
//import com.fasterxml.jackson.databind.ObjectMapper;
//import org.springframework.cache.CacheManager;
//import org.springframework.cache.annotation.CachingConfigurerSupport;
//import org.springframework.cache.interceptor.KeyGenerator;
//import org.springframework.context.annotation.Bean;
//import org.springframework.data.redis.cache.RedisCacheConfiguration;
//import org.springframework.data.redis.cache.RedisCacheManager;
//import org.springframework.data.redis.cache.RedisCacheWriter;
//import org.springframework.data.redis.connection.lettuce.LettuceConnectionFactory;
//import org.springframework.data.redis.core.RedisTemplate;
//import org.springframework.data.redis.core.StringRedisTemplate;
//import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
//
//import java.lang.reflect.Method;
//
//public class CacheConfig extends CachingConfigurerSupport {
//
// /**
// * 自定义缓存key的生成策略。默认的生成策略是看不懂的(乱码内容) 通过Spring 的依赖注入特性进行自定义的配置注入并且此类是一个配置类可以更多程度的自定义配置
// *
// * @return
// */
// @Bean
// @Override
// public KeyGenerator keyGenerator() {
// return new KeyGenerator() {
// @Override
// public Object generate(Object target, Method method, Object... params) {
// StringBuilder sb = new StringBuilder();
// sb.append(target.getClass().getName());
// sb.append(method.getName());
// for (Object obj : params) {
// sb.append(obj.toString());
// }
// return sb.toString();
// }
// };
// }
//
// /**
// * 缓存配置管理器
// */
// @Bean
// public CacheManager cacheManager(LettuceConnectionFactory factory) {
// //以锁写入的方式创建RedisCacheWriter对象
// RedisCacheWriter writer = RedisCacheWriter.lockingRedisCacheWriter(factory);
// /*
// 设置CacheManager的Value序列化方式为JdkSerializationRedisSerializer,
// 但其实RedisCacheConfiguration默认就是使用
// StringRedisSerializer序列化key,
// JdkSerializationRedisSerializer序列化value,
// 所以以下注释代码就是默认实现,没必要写,直接注释掉
// */
// // RedisSerializationContext.SerializationPair pair = RedisSerializationContext.SerializationPair.fromSerializer(new JdkSerializationRedisSerializer(this.getClass().getClassLoader()));
// // RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig().serializeValuesWith(pair);
// //创建默认缓存配置对象
// RedisCacheConfiguration config = RedisCacheConfiguration.defaultCacheConfig();
// RedisCacheManager cacheManager = new RedisCacheManager(writer, config);
// return cacheManager;
// }
//
// /**
// * 获取缓存操作助手对象
// *
// * @return
// */
// @Bean
// public RedisTemplate<String, String> redisTemplate(LettuceConnectionFactory factory) {
// //创建Redis缓存操作助手RedisTemplate对象
// StringRedisTemplate template = new StringRedisTemplate();
// template.setConnectionFactory(factory);
// //以下代码为将RedisTemplate的Value序列化方式由JdkSerializationRedisSerializer更换为Jackson2JsonRedisSerializer
// //此种序列化方式结果清晰、容易阅读、存储字节少、速度快,所以推荐更换
// Jackson2JsonRedisSerializer jackson2JsonRedisSerializer = new Jackson2JsonRedisSerializer(Object.class);
// ObjectMapper om = new ObjectMapper();
// om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
// om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
// jackson2JsonRedisSerializer.setObjectMapper(om);
// template.setValueSerializer(jackson2JsonRedisSerializer);
// template.afterPropertiesSet();
// //StringRedisTemplate是RedisTempLate<String, String>的子类
// return template;
// }
//}
\ No newline at end of file
src/main/java/com/gogirl/infrastructure/config/MvcInterceptorConfig.java
View file @
076069ca
package
com
.
gogirl
.
infrastructure
.
config
;
import
com.gogirl.infrastructure.interceptor.AuthHandlerInterceptor
;
import
com.gogirl.infrastructure.interceptor.LogHandlerInterceptor
;
import
com.gogirl.infrastructure.interceptor.LoginHandlerInterceptor
;
import
com.gogirl.infrastructure.interceptor.SessionHandlerInterceptor
;
...
...
@@ -16,6 +17,7 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
private
final
LoginHandlerInterceptor
loginHandlerInterceptor
;
private
final
LogHandlerInterceptor
logHandlerInterceptor
;
private
final
SessionHandlerInterceptor
sessionHandlerInterceptor
;
private
final
AuthHandlerInterceptor
authHandlerInterceptor
;
@Override
protected
void
addInterceptors
(
InterceptorRegistry
registry
)
{
...
...
@@ -71,9 +73,70 @@ public class MvcInterceptorConfig extends WebMvcConfigurationSupport {
registry
.
addInterceptor
(
logHandlerInterceptor
);
registry
.
addInterceptor
(
sessionHandlerInterceptor
);
registry
.
addInterceptor
(
authHandlerInterceptor
)
.
addPathPatterns
(
"/**"
)
.
excludePathPatterns
(
"/swagger-resources/**"
,
"/webjars/**"
,
"/v2/**"
,
"/swagger-ui.html/**"
,
"/error"
)
//登陆
.
excludePathPatterns
(
"/customer/message/loginLog"
)
.
excludePathPatterns
(
"/customer/message/pageIn"
)
.
excludePathPatterns
(
"/customer/message/pageOut"
)
.
excludePathPatterns
(
"/customer/message/logoutLog"
)
.
excludePathPatterns
(
"/customer/leisure/queryMinDiscount"
)
.
excludePathPatterns
(
"/customer/xcx/login"
)
.
excludePathPatterns
(
"/customer/csrf"
)
.
excludePathPatterns
(
"/customer/mallCategory/getCategoryTree"
)
.
excludePathPatterns
(
"/customer/mallCategory/getCategoryList"
)
.
excludePathPatterns
(
"/customer/mallProduct/queryPageProduct"
)
.
excludePathPatterns
(
"/customer/mallProduct/queryProduct"
)
.
excludePathPatterns
(
"/customer/serve/no_queryNewServePage"
)
.
excludePathPatterns
(
"/customer/serve/queryServeForPage"
)
.
excludePathPatterns
(
"/customer/broadcast/queryBroadcast"
)
.
excludePathPatterns
(
"/customer/shop/queryShopEnvironmentPhotos"
)
//回调
.
excludePathPatterns
(
"/customer/pay/notifyTimesCard"
)
.
excludePathPatterns
(
"/customer/pay/notifyCharge"
)
.
excludePathPatterns
(
"/customer/mallOrderPay/notifyMallOrder"
)
.
excludePathPatterns
(
"/customer/pay/notifyOrder"
)
.
excludePathPatterns
(
"/customer/pay/notifyBalanceWxPay"
)
.
excludePathPatterns
(
"/customer/xcx/authorized1"
)
.
excludePathPatterns
(
"/customer/xcx/authorizedPhone"
)
.
excludePathPatterns
(
"/customer/message/queryPageMessage"
)
//退款
.
excludePathPatterns
(
"/customer/mallOrderPay/refund/*"
)
.
excludePathPatterns
(
"/customer/xcx/upload"
)
.
excludePathPatterns
(
"/technician/xcx/login"
)
.
excludePathPatterns
(
"/csrf"
)
.
excludePathPatterns
(
"/technician/xcx/login_t"
)
.
excludePathPatterns
(
"/technician/phone/bindPhone_t"
)
.
excludePathPatterns
(
"/technician/phone/getBindCode"
)
.
excludePathPatterns
(
"/technician/xcx/upload"
)
.
excludePathPatterns
(
"/technician/xcx/getUserInfo_t"
)
.
excludePathPatterns
(
"/technician/xcx/choseStore"
)
.
excludePathPatterns
(
"/technician/xcx/getTechnicianShopList"
)
.
excludePathPatterns
(
"/customer/produce/queryProduceDetail"
)
.
excludePathPatterns
(
"/customer/shop/queryShopForPage"
)
.
excludePathPatterns
(
"/customer/mallCart/listMallShoppingCart"
)
.
excludePathPatterns
(
"/customer/queryPageLeisureScheduleServe"
)
.
excludePathPatterns
(
"/customer/getMyCoupon"
)
.
excludePathPatterns
(
"/customer/timescard/getMyTimesCardList"
)
.
excludePathPatterns
(
"/customer/selectAllDiscount"
)
.
excludePathPatterns
(
"/customer/xcx/getUserInfo"
)
;
super
.
addInterceptors
(
registry
);
}
//
// https://t.begogirls.com/customer/produce/queryProduceDetail2?id=265&token=1240914668441079809
// https://t.begogirls.com/customer/shop/queryShopForPage?pageNum=1&pageSize=10&longitude=113.36199&latitude=23.12463&token=1240914668441079809
// https://t.begogirls.com/customer/mallCart/listMallShoppingCart
// https://t.begogirls.com/customer/queryPageLeisureScheduleServe
// https://t.begogirls.com/customer/getMyCoupon?state=1&token=1240914668441079809
// https://t.begogirls.com/customer/timescard/getMyTimesCardList?token=1240914668441079809
// https://t.begogirls.com/customer/selectAllDiscount?token=1240914668441079809
// https://t.begogirls.com/customer/xcx/getUserInfo?token=1240914668441079809
@Override
public
void
addResourceHandlers
(
ResourceHandlerRegistry
registry
)
{
...
...
src/main/java/com/gogirl/infrastructure/config/WxMaConfiguration.java
View file @
076069ca
...
...
@@ -3,6 +3,7 @@ package com.gogirl.infrastructure.config;
import
cn.binarywang.wx.miniapp.api.WxMaService
;
import
cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl
;
import
cn.binarywang.wx.miniapp.config.WxMaInMemoryConfig
;
import
com.gogirl.infrastructure.config.property.WxMaProperties
;
import
org.springframework.context.annotation.Bean
;
import
org.springframework.context.annotation.Configuration
;
...
...
src/main/java/com/gogirl/infrastructure/config/WxPayConfiguration.java
View file @
076069ca
...
...
@@ -3,6 +3,7 @@ package com.gogirl.infrastructure.config;
import
com.github.binarywang.wxpay.config.WxPayConfig
;
import
com.github.binarywang.wxpay.service.WxPayService
;
import
com.github.binarywang.wxpay.service.impl.WxPayServiceImpl
;
import
com.gogirl.infrastructure.config.property.WxPayProperties
;
import
org.apache.commons.lang3.StringUtils
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.condition.ConditionalOnClass
;
...
...
@@ -12,7 +13,7 @@ import org.springframework.context.annotation.Bean;
import
org.springframework.context.annotation.Configuration
;
/**
*
@author Binary Wang
*
微信支付配置
*/
@Configuration
@ConditionalOnClass
(
WxPayService
.
class
)
...
...
src/main/java/com/gogirl/infrastructure/config/GogirlProperties.java
→
src/main/java/com/gogirl/infrastructure/config/
property/
GogirlProperties.java
View file @
076069ca
package
com
.
gogirl
.
infrastructure
.
config
;
package
com
.
gogirl
.
infrastructure
.
config
.
property
;
import
lombok.Data
;
...
...
src/main/java/com/gogirl/infrastructure/config/WxMaProperties.java
→
src/main/java/com/gogirl/infrastructure/config/
property/
WxMaProperties.java
View file @
076069ca
package
com
.
gogirl
.
infrastructure
.
config
;
package
com
.
gogirl
.
infrastructure
.
config
.
property
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
org.springframework.stereotype.Component
;
...
...
src/main/java/com/gogirl/infrastructure/config/WxPayProperties.java
→
src/main/java/com/gogirl/infrastructure/config/
property/
WxPayProperties.java
View file @
076069ca
package
com
.
gogirl
.
infrastructure
.
config
;
package
com
.
gogirl
.
infrastructure
.
config
.
property
;
import
lombok.Data
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
/**
*
wxpay pay properties
*
微信支付配置属性
*
* @author Binary Wang
*/
@Data
@ConfigurationProperties
(
prefix
=
"wx.pay"
)
public
class
WxPayProperties
{
/**
* 设置微信公众号或者小程序等的appid
*/
...
...
src/main/java/com/gogirl/infrastructure/config/WxProperties.java
→
src/main/java/com/gogirl/infrastructure/config/
property/
WxProperties.java
View file @
076069ca
package
com
.
gogirl
.
infrastructure
.
config
;
package
com
.
gogirl
.
infrastructure
.
config
.
property
;
import
lombok.Data
;
...
...
@@ -45,12 +45,23 @@ public class WxProperties {
*/
private
String
orderPayNotifyTpl
;
/**
* 问卷调查消息模版
*/
public
String
testPaperTpl
;
/**
* 店铺预约小程序订阅消息模版
*/
private
String
shopScheduleTpl
;
/**
* 店铺预约超时小程序消息模版
*/
private
String
shopOverScheduleTpl
;
/**
* 用户取消店铺小程序订阅消息模版
*/
private
String
shopCancelScheduleTpl
;
}
src/main/java/com/gogirl/infrastructure/interceptor/AuthHandlerInterceptor.java
View file @
076069ca
...
...
@@ -21,7 +21,6 @@ import javax.servlet.http.HttpServletResponse;
public
class
AuthHandlerInterceptor
implements
HandlerInterceptor
{
private
final
GogirlTokenService
gogirlTokenService
;
private
final
StoreManageMapper
storeManageMapper
;
private
final
CustomerMapper
customerMapper
;
@Override
...
...
src/main/java/com/gogirl/infrastructure/interceptor/LoginHandlerInterceptor.java
View file @
076069ca
...
...
@@ -2,11 +2,9 @@ package com.gogirl.infrastructure.interceptor;
import
com.gogirl.application.xcx.GogirlTokenService
;
import
com.gogirl.domain.store.store.StoreManage
;
import
com.gogirl.domain.user.customer.Customer
;
import
com.gogirl.domain.xcx.GogirlToken
;
import
com.gogirl.infrastructure.common.exception.RRException
;
import
com.gogirl.infrastructure.common.util.ListUtil
;
import
com.gogirl.infrastructure.common.util.StringUtils
;
import
com.gogirl.infrastructure.mapper.store.store.StoreManageMapper
;
import
com.gogirl.infrastructure.mapper.user.customer.CustomerMapper
;
import
lombok.AllArgsConstructor
;
...
...
@@ -44,12 +42,13 @@ public class LoginHandlerInterceptor implements HandlerInterceptor {
GogirlToken
gogirlToken
=
gogirlTokenService
.
getByToken
(
token
);
if
(
gogirlToken
==
null
)
{
throw
new
RRException
(
2000
,
"token失效,请重新登陆"
);
}
else
{
Customer
customer
=
customerMapper
.
selectById
(
gogirlToken
.
getCustomerId
());
if
(
customer
!=
null
&&
StringUtils
.
isEmpty
(
customer
.
getPhone
()))
{
throw
new
RRException
(
1001
,
"请授权手机号码"
);
}
}
// else {
// Customer customer = customerMapper.selectById(gogirlToken.getCustomerId());
// if (customer != null && StringUtils.isEmpty(customer.getPhone())) {
// throw new RRException(1001, "请授权手机号码");
// }
// }
}
if
(
sourceFrom
.
equals
(
"technician"
))
{
GogirlToken
gogirlToken
=
gogirlTokenService
.
getByToken
(
token
);
...
...
src/main/java/com/gogirl/infrastructure/schedule/Schedule.java
View file @
076069ca
...
...
@@ -23,7 +23,7 @@ import com.gogirl.domain.user.customer.Customer;
import
com.gogirl.domain.user.customer.CustomerBalanceRecord
;
import
com.gogirl.domain.xcx.WeekConfig
;
import
com.gogirl.infrastructure.common.util.ListUtil
;
import
com.gogirl.infrastructure.config.GogirlProperties
;
import
com.gogirl.infrastructure.config.
property.
GogirlProperties
;
import
com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper
;
import
com.gogirl.infrastructure.mapper.order.mall.MallOrderMapper
;
import
com.gogirl.infrastructure.mapper.order.serve.OrderManageMapper
;
...
...
src/main/java/com/gogirl/infrastructure/subscribe/impl/SubscribeServiceImpl.java
View file @
076069ca
package
com
.
gogirl
.
infrastructure
.
subscribe
.
impl
;
import
com.gogirl.application.xcx.impl.AccessTokenService
;
import
com.gogirl.infrastructure.config.WxProperties
;
import
com.gogirl.infrastructure.config.
property.
WxProperties
;
import
com.gogirl.infrastructure.feign.wx.WxSubscribeControllerFeign
;
import
com.gogirl.infrastructure.subscribe.SubscribeService
;
import
com.gogirl.shared.wx.*
;
...
...
src/main/java/com/gogirl/interfaces/order/mall/MallOrderPayController.java
View file @
076069ca
...
...
@@ -8,8 +8,8 @@ import com.github.binarywang.wxpay.exception.WxPayException;
import
com.gogirl.application.order.mall.*
;
import
com.gogirl.application.xcx.GogirlTokenService
;
import
com.gogirl.infrastructure.common.base.JsonResult
;
import
com.gogirl.infrastructure.config.GogirlProperties
;
import
com.gogirl.infrastructure.config.WxProperties
;
import
com.gogirl.infrastructure.config.
property.
GogirlProperties
;
import
com.gogirl.infrastructure.config.
property.
WxProperties
;
import
com.gogirl.infrastructure.feign.wx.WxPayControllerFeign
;
import
com.gogirl.infrastructure.mapper.user.customer.CustomerMapper
;
import
com.gogirl.infrastructure.util.SessionUtils
;
...
...
src/main/java/com/gogirl/interfaces/user/TimesCardController.java
View file @
076069ca
...
...
@@ -18,7 +18,7 @@ import com.gogirl.infrastructure.common.annotation.GogirlMember;
import
com.gogirl.infrastructure.common.base.JsonResult
;
import
com.gogirl.infrastructure.common.exception.RRException
;
import
com.gogirl.infrastructure.common.util.ListUtil
;
import
com.gogirl.infrastructure.config.GogirlProperties
;
import
com.gogirl.infrastructure.config.
property.
GogirlProperties
;
import
com.gogirl.infrastructure.feign.wx.WxPayControllerFeign
;
import
com.gogirl.infrastructure.mapper.market.discount.DiscountConfigMapper
;
import
com.gogirl.infrastructure.mapper.market.timescard.TimesCardCustomerRelevanceMapper
;
...
...
src/main/java/com/gogirl/interfaces/xcx/PayController.java
View file @
076069ca
...
...
@@ -15,7 +15,7 @@ import com.gogirl.domain.user.customer.CustomerBalanceRecord;
import
com.gogirl.domain.xcx.GogirlToken
;
import
com.gogirl.infrastructure.common.base.JsonResult
;
import
com.gogirl.infrastructure.common.exception.RRException
;
import
com.gogirl.infrastructure.config.GogirlProperties
;
import
com.gogirl.infrastructure.config.
property.
GogirlProperties
;
import
com.gogirl.infrastructure.feign.wx.WxPayControllerFeign
;
import
com.gogirl.infrastructure.mapper.store.store.UserManageMapper
;
import
com.gogirl.infrastructure.mapper.user.customer.CustomerBalanceMapper
;
...
...
src/main/java/com/gogirl/interfaces/xcx/XcxController.java
View file @
076069ca
...
...
@@ -7,7 +7,7 @@ import com.gogirl.domain.store.store.StoreManage;
import
com.gogirl.domain.store.store.StoreTechnician
;
import
com.gogirl.domain.user.customer.Customer
;
import
com.gogirl.infrastructure.common.base.JsonResult
;
import
com.gogirl.infrastructure.config.GogirlProperties
;
import
com.gogirl.infrastructure.config.
property.
GogirlProperties
;
import
com.gogirl.infrastructure.mapper.user.customer.CustomerMapper
;
import
com.gogirl.infrastructure.util.ImageUtil
;
import
com.gogirl.shared.user.query.qry.CustomerQuery
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment