Commit 6a54477e by huluobin

decimal divide

parent a0e34f73
...@@ -3,6 +3,7 @@ package com.gogirl.application.user.customer.impl; ...@@ -3,6 +3,7 @@ package com.gogirl.application.user.customer.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.IdWorker; import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.gogirl.application.common.IAgentConfigService;
import com.gogirl.application.common.IAgentUserService; import com.gogirl.application.common.IAgentUserService;
import com.gogirl.application.common.xcx.GogirlTokenService; import com.gogirl.application.common.xcx.GogirlTokenService;
import com.gogirl.application.common.xcx.QRCodeService; import com.gogirl.application.common.xcx.QRCodeService;
...@@ -10,6 +11,7 @@ import com.gogirl.application.common.xcx.WechatService; ...@@ -10,6 +11,7 @@ import com.gogirl.application.common.xcx.WechatService;
import com.gogirl.application.order.serve.OrderManageService; import com.gogirl.application.order.serve.OrderManageService;
import com.gogirl.application.user.customer.CustomerDetailService; import com.gogirl.application.user.customer.CustomerDetailService;
import com.gogirl.application.user.customer.CustomerService; import com.gogirl.application.user.customer.CustomerService;
import com.gogirl.domain.common.AgentConfig;
import com.gogirl.domain.common.AgentUser; import com.gogirl.domain.common.AgentUser;
import com.gogirl.domain.common.xcx.GogirlConfig; import com.gogirl.domain.common.xcx.GogirlConfig;
import com.gogirl.domain.common.xcx.GogirlToken; import com.gogirl.domain.common.xcx.GogirlToken;
...@@ -304,6 +306,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i ...@@ -304,6 +306,8 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
@Resource @Resource
IAgentUserService agentUserService; IAgentUserService agentUserService;
@Resource
IAgentConfigService agentConfigService;
@Override @Override
public Customer getUserInfo(String token) throws Exception { public Customer getUserInfo(String token) throws Exception {
...@@ -315,6 +319,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i ...@@ -315,6 +319,9 @@ public class CustomerServiceImpl extends ServiceImpl<CustomerMapper, Customer> i
AgentUser agentUser = agentUserService.selectByPhone(customer.getPhone()); AgentUser agentUser = agentUserService.selectByPhone(customer.getPhone());
AgentConfig agentConfig = agentConfigService.getById(agentUser.getLevel());
agentUser.setAgentConfig(agentConfig);
customer.setCustomerDetail(customerDetail); customer.setCustomerDetail(customerDetail);
customer.setCustomerBalance(customerBalance); customer.setCustomerBalance(customerBalance);
customer.setAgentUser(agentUser); customer.setAgentUser(agentUser);
......
package com.gogirl.domain.common; package com.gogirl.domain.common;
import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.Version; import com.baomidou.mybatisplus.annotation.Version;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
...@@ -89,5 +90,7 @@ public class AgentUser implements Serializable { ...@@ -89,5 +90,7 @@ public class AgentUser implements Serializable {
@ApiModelProperty(value = "累积消费金额") @ApiModelProperty(value = "累积消费金额")
private BigDecimal consumeAmount; private BigDecimal consumeAmount;
@TableField(exist = false)
private AgentConfig agentConfig;
} }
package com.gogirl.infrastructure.common.interceptor; package com.gogirl.infrastructure.common.interceptor;
import com.gogirl.application.common.xcx.GogirlTokenService; import com.gogirl.application.common.xcx.GogirlTokenService;
import com.gogirl.application.user.customer.CustomerService;
import com.gogirl.domain.common.xcx.GogirlToken; import com.gogirl.domain.common.xcx.GogirlToken;
import com.gogirl.infrastructure.common.util.SessionUtils; import com.gogirl.infrastructure.common.util.SessionUtils;
import com.gogirl.infrastructure.mapper.store.store.StoreManageMapper;
import com.gogirl.infrastructure.mapper.store.store.StoreTechnicianMapper;
import com.gogirl.infrastructure.mapper.user.customer.StoreUserMapper;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component; import org.springframework.stereotype.Component;
...@@ -22,11 +18,6 @@ import javax.servlet.http.HttpServletResponse; ...@@ -22,11 +18,6 @@ import javax.servlet.http.HttpServletResponse;
public class SessionHandlerInterceptor implements HandlerInterceptor { public class SessionHandlerInterceptor implements HandlerInterceptor {
private final GogirlTokenService gogirlTokenService; private final GogirlTokenService gogirlTokenService;
private final CustomerService customerService;
private final StoreTechnicianMapper storeTechnicianMapper;
private final StoreManageMapper storeManageMapper;
private final StoreUserMapper storeUserMapper;
@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment