登录传入referer

订单统计

book-dao/src/main/resources/mybatis-generator.xml

@@ -133,8 +133,9 @@
 <!--        <table tableName="login"></table>-->
 <!--        <table tableName="goods"></table>-->
 <!--        <table tableName="user_read_config"></table>-->
-        <table tableName="custom_url"></table>
-        <table tableName="custom_media_push"></table>
+     <!--   <table tableName="custom_url"></table>
+        <table tableName="custom_media_push"></table>-->
+        <table tableName="orders_collect"></table>
 
 
     </context>

book-push/src/main/java/com/book/push/Application.java

@@ -18,8 +18,8 @@ public class Application {
     public static void main(String[] args) {
 
         //下面语句使得日志输出使用异步处理，减小输出日志对性能的影响
-        System.setProperty("Log4jContextSelector",
-                "org.apache.logging.log4j.core.async.AsyncLoggerContextSelector");
+      /*  System.setProperty("Log4jContextSelector",
+                "org.apache.logging.log4j.core.async.AsyncLoggerContextSelector");*/
         SpringApplication.run(Application.class);
         System.out.println("---------------------------------------------------------------------------------------------------------------");
         System.out.println("----------------                                                                   ---------------------------");

book-push/src/main/java/com/book/push/controller/LoginController.java

@@ -22,7 +22,6 @@ import me.chanjar.weixin.common.bean.WxOAuth2UserInfo;
 import me.chanjar.weixin.common.bean.oauth2.WxOAuth2AccessToken;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.common.service.WxOAuth2Service;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
@@ -33,7 +32,6 @@ import org.springframework.web.bind.annotation.RequestParam;
 import javax.servlet.http.HttpServletRequest;
 
 /**
- *
  * @author
  */
 @Slf4j
@@ -66,14 +64,15 @@ public class LoginController {
 
 
     @GetMapping
-    public String userLogin(HttpServletRequest request, @RequestParam(required=false) String appid, @RequestParam(required=false) String code, @RequestParam(required=false) String state) {
-
-
+    public String userLogin(HttpServletRequest request, @RequestParam(required = false) String appid, @RequestParam(required = false) String code,
+                            @RequestParam(required = false) String state, @RequestParam(required = false) String reURL) {
+        log.debug("静默登录：appid={},code={},state={}", appid, code, state);
         WxOAuth2AccessToken oAuth2rRefreshToken = null;
         String domainName = request.getServerName();
+        log.debug("静默登录：serverName={}", domainName);
         if (code == null) {
 
-            return fromFront(request, domainName);
+            return fromFront(request, domainName, reURL);
 
         } else {
             AdminConfig adminConfig = adminConfigService.selectByAppid(appid);
@@ -84,32 +83,36 @@ public class LoginController {
                 WxOAuth2Service oAuth2Service = thirdPartService.getWxOpenServiceByAuthorizerAppid(adminConfig.getAppid())
                         .getWxOpenComponentService().getWxMpServiceByAppid(adminConfig.getAppid()).getOAuth2Service();
                 user = userService.selectByOpenId(oAuth2rRefreshToken.getOpenId());
-                if (user==null){
-                    WxOAuth2UserInfo userInfo = oAuth2Service.getUserInfo(oAuth2rRefreshToken, "");
-                    log.info(userInfo.toString());
-                    user = userService.createUserByWxOAuth2UserInfo(userInfo,adminConfig.getAdminId());
-
+                if (user == null) {
+//                    WxOAuth2UserInfo userInfo = oAuth2Service.getUserInfo(oAuth2rRefreshToken, "");
+//                    log.info(userInfo.toString());
+//                    user = userService.createUserByWxOAuth2UserInfo(userInfo,adminConfig.getAdminId());
+                    log.info("user==null,首次登录...");
+                    user = userService.createUserByOpenid(oAuth2rRefreshToken.getOpenId(), adminConfig.getAdminId());
+                    log.info("创建user成功，user=" + user.toString());
                 }
-            } catch (WxErrorException e) {
+            } catch (Exception e) {
                 e.printStackTrace();
                 user = userService.createUserByOpenid(oAuth2rRefreshToken.getOpenId(), adminConfig.getAdminId());
             }
-            return buildRedirectUrl(getFontUlr(redisService.get(state),adminConfig,user.getId(),oAuth2rRefreshToken.getOpenId()));
+            return buildRedirectUrl(getFontUlr(redisService.get(state), adminConfig, user.getId(), oAuth2rRefreshToken.getOpenId()));
         }
 
 
-
-
     }
 
-    private String fromFront(HttpServletRequest request, String domainName) {
-        WxOAuth2AccessToken oAuth2rRefreshToken=null;
+    private String fromFront(HttpServletRequest request, String domainName, String reURL) {
+        WxOAuth2AccessToken oAuth2rRefreshToken = null;
         String referer = request.getHeader("referer");
+        log.info("referer=" + referer);
+
+        referer = reURL;
+
         if (referer == null) {
             return buildRedirectUrl(null);
         }
-        String state = Md5Util.md5(referer);
 
+        String state = Md5Util.md5(referer);
 
 
         String appid = getAppIdByReferer(referer);
@@ -119,11 +122,11 @@ public class LoginController {
                 .getWxOpenComponentService().getWxMpServiceByAppid(adminConfig.getAppid()).getOAuth2Service();
         if (oAuth2rRefreshToken == null) {
             if (redisService.get(state) == null) {
-                redisService.set(state, referer);
+                redisService.set(state, referer, 60);
             }
             String redirectUrl = String.format(UrlCons.URL_OAUTH2_REDIRECT_LOGIN, domainName);
 
-            String auto2Url = oAuth2Service.buildAuthorizationUrl(redirectUrl, WxConsts.OAuth2Scope.SNSAPI_USERINFO, state);
+            String auto2Url = oAuth2Service.buildAuthorizationUrl(redirectUrl, WxConsts.OAuth2Scope.SNSAPI_BASE, state);
             return buildRedirectUrl(auto2Url);
         } else {
 
@@ -132,10 +135,10 @@ public class LoginController {
             try {
                 log.info(oAuth2rRefreshToken.toString());
                 user = userService.selectByOpenId(oAuth2rRefreshToken.getOpenId());
-                if (user==null){
+                if (user == null) {
                     WxOAuth2UserInfo userInfo = oAuth2Service.getUserInfo(oAuth2rRefreshToken, "");
                     log.info(userInfo.toString());
-                    user = userService.createUserByWxOAuth2UserInfo(userInfo,adminConfig.getAdminId());
+                    user = userService.createUserByWxOAuth2UserInfo(userInfo, adminConfig.getAdminId());
 
                 }
 
@@ -143,7 +146,7 @@ public class LoginController {
                 e.printStackTrace();
                 user = userService.createUserByOpenid(oAuth2rRefreshToken.getOpenId(), adminConfig.getAdminId());
             }
-            return buildRedirectUrl(getFontUlr(referer,adminConfig,user.getId(),oAuth2rRefreshToken.getOpenId()));
+            return buildRedirectUrl(getFontUlr(referer, adminConfig, user.getId(), oAuth2rRefreshToken.getOpenId()));
         }
     }
 
@@ -158,19 +161,17 @@ public class LoginController {
     }
 
 
-
-
     private String buildRedirectUrl(String fontUlr) {
         if (fontUlr == null || !fontUlr.toLowerCase().startsWith("http")) {
 
             String msg = (fontUlr == null ? "登陆失败，请在网页内登录" : fontUlr);
             return msg;
         }
-        log.info("跳转：" +fontUlr);
+        log.info("跳转：" + fontUlr);
         return "redirect:" + fontUlr;
     }
 
-    private String getFontUlr(String referer, AdminConfig adminConfig, Long userId,String openid) {
+    private String getFontUlr(String referer, AdminConfig adminConfig, Long userId, String openid) {
         if (referer == null) {
             return "登录失败啦，请在网站里面进行登录";
         }
@@ -178,9 +179,8 @@ public class LoginController {
         Ophost ophost = opHostService.selectById(ophostId);
 //        String s = redisService.get(referer);
         String url = UrlUtil.replaceDomain(referer, adminConfig.getAppid() + "." + ophost.getHost());
-        return UrlUtil.addParams(url, String.format(UrlCons.URL_PARAMS, adminConfig.getAdminId(), userId,openid));
+        return UrlUtil.addParams(url, String.format(UrlCons.URL_PARAMS, adminConfig.getAdminId(), userId, openid));
     }
 
 
-
 }

book-push/src/main/java/com/book/push/service/dao/impl/UserServiceImpl.java

@@ -162,20 +162,17 @@ public class UserServiceImpl implements UserService {
 
     @Override
     public User createUserByOpenid(String openid, Integer channelId) {
-        User user = selectByOpenId(openid);
-        if (user == null) {
-            user = new User();
-            user.setOpenid(openid);
-            user.setNickname("");
-            user.setSex("0");
-            user.setSubscriptionExtend("0");
-            user.setCreatetime(DateUtils.getNow());
-            user.setChannelId(channelId);
-            user.setKandian(0);
-            user.setFreeKandian(0);
-            user.setState("1");
-            userMapper.insert(user);
-        }
+        User user = new User();
+        user.setOpenid(openid);
+        user.setNickname("");
+        user.setSex("0");
+        user.setSubscriptionExtend("0");
+        user.setCreatetime(DateUtils.getNow());
+        user.setChannelId(channelId);
+        user.setKandian(0);
+        user.setFreeKandian(0);
+        user.setState("1");
+        userMapper.insert(user);
         return user;
 
     }
@@ -186,7 +183,7 @@ public class UserServiceImpl implements UserService {
     }
 
     @Override
-    public User updateUserByWxUser(Long id,WxMpUser wxMpUser) {
+    public User updateUserByWxUser(Long id, WxMpUser wxMpUser) {
         User user = new User();
         user.setId(id);
         user.setOpenid(wxMpUser.getOpenId());

book-push/src/main/resources/log4j2.xml

@@ -55,12 +55,14 @@
     <!--然后定义logger，只有定义了logger并引入的appender，appender才会生效-->
     <loggers>
         <!-- com.example 包下日志采用异步模式 -->
-        <AsyncLogger name="com.book" level="info" additivity="false" includeLocation="true">
+      <!--  <AsyncLogger name="com.book" level="info" additivity="false" includeLocation="true">
             <AppenderRef ref="Console" />
             <AppenderRef ref="RollingFileInfo" />
             <AppenderRef ref="RollingFileWarn" />
             <AppenderRef ref="RollingFileError" />
-        </AsyncLogger>
+        </AsyncLogger>-->
+
+
         <!--过滤掉spring和mybatis的一些无用的DEBUG信息-->
         <logger name="org.springframework" level="INFO"/>
         <logger name="org.mybatis" level="INFO"/>

book-server/src/main/java/com/book/server/service/impl/WxPayServiceImpl.java

@@ -2,8 +2,10 @@ package com.book.server.service.impl;
 
 import com.book.dao.VO.*;
 import com.book.dao.cps.entity.Goods;
+import com.book.dao.cps.entity.OrdersCollect;
 import com.book.dao.cps.mapper.*;
 import com.book.dao.cps.pojo.*;
+import com.book.dao.cps.pojo.example.OrdersCollectExample;
 import com.book.dao.utils.DateUtils;
 import com.book.dao.utils.TimeUtil;
 import com.book.server.config.Const;
@@ -20,6 +22,7 @@ import org.springframework.stereotype.Service;
 import javax.servlet.http.HttpServletRequest;
 import java.io.UnsupportedEncodingException;
 import java.math.BigDecimal;
+import java.sql.Date;
 import java.util.*;
 import java.util.concurrent.TimeUnit;
 
@@ -36,7 +39,7 @@ public class WxPayServiceImpl implements WxPayService {
     public static final String PALMPAY_APPID = "";
     public static final String PALMPAY_APPKEY = "";
     public static final String PALMPAY_MCHID = "";
-//    public static final String PALMPAY_URL = "https://pay.palmpay.cn/sdkServer/thirdpays/pay/WECHAT_SUB";
+    //    public static final String PALMPAY_URL = "https://pay.palmpay.cn/sdkServer/thirdpays/pay/WECHAT_SUB";
     public static final String PALMPAY_URL = "http://101.200.72.53:18085/sdkServer/thirdpays/pay/WECHAT_SUB";
     @Autowired
     private GoodsMapper goodsMapper;
@@ -60,6 +63,8 @@ public class WxPayServiceImpl implements WxPayService {
     private AdminExtendMapper adminExtendMapper;
     @Autowired
     private CacheService cacheService;
+    @Autowired
+    private OrdersCollectMapper ordersCollectMapper;
 
     @Override
     public WxPayInfo createOrder(WxPayRequest wxPayRequest) {
@@ -139,8 +144,6 @@ public class WxPayServiceImpl implements WxPayService {
         map.put("ip", wxPayRequest.getIp());
 
 
-
-
         String str = palmpayAppid + "WECHAT_SUB" + amount + mchOrderid + palmpayAppkey;
 
         String sign = Md5Util.md5(str);
@@ -152,8 +155,8 @@ public class WxPayServiceImpl implements WxPayService {
         WxPayInfo wxPayInfo = new WxPayInfo();
         wxPayInfo.setUserId(userByUserId.getId() + "");
         wxPayInfo.setOrderId(String.valueOf(order.getId()));
-        if ( StringUtils.isNotEmpty(wxPayRequest.getOpenid())) {
-            map.put("subAppid", appid==null?"":appid);
+        if (StringUtils.isNotEmpty(wxPayRequest.getOpenid())) {
+            map.put("subAppid", appid == null ? "" : appid);
             map.put("openid", wxPayRequest.getOpenid());
             map.put("api", "1");
             String result = HTTPSUtil.sendGetByHttps(PALMPAY_URL, map);
@@ -173,9 +176,9 @@ public class WxPayServiceImpl implements WxPayService {
 
 
             updateOrder.setPayJson(pay_info);
-            if(pay_info.startsWith("http")){
+            if (pay_info.startsWith("http")) {
                 wxPayInfo.setUrl(PALMPAY_URL + "?" + form);
-            }else {
+            } else {
                 Map<String, Object> map1 = JsonUtils.getMap(pay_info);
                 wxPayInfo.setPayInfo(map1);
                 wxPayInfo.setUrl("");
@@ -185,6 +188,43 @@ public class WxPayServiceImpl implements WxPayService {
         } else {
             wxPayInfo.setUrl(PALMPAY_URL + "?" + form);
         }
+        try {
+            OrdersCollect ordersCollect = new OrdersCollect();
+            ordersCollect.setAdminId(adminConfig.getAdminId());
+            ordersCollect.setType("1");
+            ordersCollect.setFlag("1");
+            ordersCollect.setBusinessLine("1");
+
+            ordersCollect.setCreatedate(DateUtils.getDateNow() + "");
+            ordersCollect.setRechargeMoney(new BigDecimal(0.00));
+            ordersCollect.setRechargeMoneyBenefit(new BigDecimal(0.00));
+            ordersCollect.setNormalRechargeOrdersCount(1);
+            ordersCollect.setNormalRechargeOrders(0);
+            ordersCollect.setNormalRechargeMoney(new BigDecimal(0.00));
+            ordersCollect.setNormalRechargeMoneyBenefit(new BigDecimal(0.00));
+            ordersCollect.setNormalRechargeUserSucCount(0);
+            ordersCollect.setNormalRechargeUserCount(1);
+            ordersCollect.setNormalRechargeGuideOrders(0);
+            ordersCollect.setNoramlRechargeGuideMoney(new BigDecimal(0.00));
+            ordersCollect.setNoramlRechargeGuideMoneyBenefit(new BigDecimal(0.00));
+            ordersCollect.setKandianRechargeOrdersCount(1);
+            ordersCollect.setCreatetime(DateUtils.getNow());
+            ordersCollect.setRechargeUserCount(1);
+            ordersCollect.setKandianRechargeOrders(0);
+            OrdersCollectExample ordersCollectExample = OrdersCollectExample.newAndCreateCriteria().andAdminIdEqualTo(ordersCollect.getAdminId())
+                    .andTypeEqualTo(ordersCollect.getType()).andFlagEqualTo(ordersCollect.getFlag()).andCreatedateEqualTo(ordersCollect.getCreatedate())
+                    .example();
+
+            OrdersCollect selectOrdersCollect = ordersCollectMapper.selectOneByExample(ordersCollectExample);
+            if (selectOrdersCollect == null) {
+                ordersCollectMapper.insert(ordersCollect);
+            } else {
+                ordersCollectMapper.updateCollect(ordersCollect);
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            log.error("订单下单统计：" + e.getMessage());
+        }
 
 
         return wxPayInfo;
@@ -236,6 +276,34 @@ public class WxPayServiceImpl implements WxPayService {
                 ordersMapper.updateByPrimaryKeySelective(orders);
                 bookService.insertKandian(order.getUserId(), "1", order.getKandian(), order.getFreeKandian());
                 cacheService.updateUserByIdCache(order.getUserId());
+
+                try {
+                    AdminExtend adminExtend = adminExtendMapper.selectByPrimaryKey(order.getAdminId());
+                    OrdersCollect ordersCollect = new OrdersCollect();
+                    ordersCollect.setAdminId(order.getAdminId());
+                    ordersCollect.setType("1");
+                    ordersCollect.setFlag("1");
+                    ordersCollect.setCreatedate(DateUtils.getDateNow() + "");
+                    ordersCollect.setRechargeMoney(order.getMoney());
+                    ordersCollect.setRechargeMoneyBenefit(order.getMoney().multiply(adminExtend.getBenefit()));
+              /*  ordersCollect.setNormalRechargeOrdersCount(0);
+                ordersCollect.setNormalRechargeUserCount(0);*/
+                    ordersCollect.setNormalRechargeOrders(1);
+                    ordersCollect.setNormalRechargeMoney(order.getMoney());
+                    ordersCollect.setNormalRechargeMoneyBenefit(order.getMoney().multiply(adminExtend.getBenefit()));
+                    ordersCollect.setNormalRechargeUserSucCount(1);
+                    ordersCollect.setKandianRechargeOrders(1);
+                    ordersCollect.setCreatetime(DateUtils.getNow());
+                    ordersCollect.setRechargeUserCount(1);
+                    ordersCollect.setKandianRechargeOrders(1);
+
+                    ordersCollectMapper.updateCollect(ordersCollect);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    log.error("统计失败：" + e.getMessage());
+                }
+
+
             }
 
 
@@ -245,21 +313,20 @@ public class WxPayServiceImpl implements WxPayService {
     }
 
 
-
     @Override
-    public String chargePage(String userId, String channelId, String redirectUrl, String redirectId, String state, String code,String openid) {
+    public String chargePage(String userId, String channelId, String redirectUrl, String redirectId, String state, String code, String openid) {
 
 
         AdminConfig adminConfig = adminConfigMapper.selectByPrimaryKey(Integer.valueOf(channelId));
         Integer wxpayId = adminConfig.getWxpayId();
         Wxpay wxpay = wxpayMapper.selectByPrimaryKey(wxpayId);
         boolean newpay = true;
-        if (newpay){
-            if (StringUtils.isEmpty(openid)){
+        if (newpay) {
+            if (StringUtils.isEmpty(openid)) {
                 User userByUserId = userService.getUserByUserId(Long.parseLong(userId));
                 openid = userByUserId.getOpenid();
             }
-            String url =String.format( Const.URL_PAY_CENTER,wxpay.getPayHost(),userId,channelId,redirectUrl,redirectId,openid);
+            String url = String.format(Const.URL_PAY_CENTER, wxpay.getPayHost(), userId, channelId, redirectUrl, redirectId, openid);
             return "redirect:" + url;
         }
 
@@ -269,9 +336,9 @@ public class WxPayServiceImpl implements WxPayService {
         String host = wxpay.getPayHost();
         if (StringUtils.isEmpty(code)) {
             String params = "userId=%s&channelId=%s&redirectUrl=%s&redirectId=%s";
-            params = String.format(params,userId,channelId,redirectUrl,redirectId);
+            params = String.format(params, userId, channelId, redirectUrl, redirectId);
 
-            String oau2thRedirectUrl = "http://" + host + "/api/wxpay/login?" +params;
+            String oau2thRedirectUrl = "http://" + host + "/api/wxpay/login?" + params;
             String url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=snsapi_base&state=%s#wechat_redirect";
             try {
                 url = String.format(url, appid, java.net.URLEncoder.encode(oau2thRedirectUrl, "UTF-8"), userId);
@@ -287,8 +354,8 @@ public class WxPayServiceImpl implements WxPayService {
             String format = String.format(openidUrl, appid, secret, code);
             String s = HttpUtils.sendGet(format);
             SnsapiBase object = JsonUtils.getObject(s, SnsapiBase.class);
-             openid = object.getOpenid();
-            String url =String.format( Const.URL_PAY_CENTER,wxpay.getPayHost(),userId,channelId,redirectUrl,redirectId,openid);
+            openid = object.getOpenid();
+            String url = String.format(Const.URL_PAY_CENTER, wxpay.getPayHost(), userId, channelId, redirectUrl, redirectId, openid);
             return "redirect:" + url;
         }
 

book-server/src/test/java/com/book/server/service/impl/BookServiceImplTest.java

@@ -1,8 +1,12 @@
 package com.book.server.service.impl;
 
+import com.book.dao.cps.entity.OrdersCollect;
+import com.book.dao.cps.mapper.OrdersCollectMapper;
 import com.book.dao.cps.mapper.OrdersMapper;
 import com.book.dao.cps.pojo.Orders;
+import com.book.dao.cps.pojo.example.OrdersCollectExample;
 import com.book.dao.utils.DateUtils;
+import com.book.dao.utils.TimeUtil;
 import com.book.server.service.BookService;
 import junit.framework.TestCase;
 import org.junit.Test;
@@ -11,6 +15,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.math.BigDecimal;
+
 @SpringBootTest
 @RunWith(SpringRunner.class)
 public class BookServiceImplTest {
@@ -19,7 +25,8 @@ public class BookServiceImplTest {
     private BookServiceImpl bookService;
     @Autowired
     private OrdersMapper ordersMapper;
-
+    @Autowired
+    private OrdersCollectMapper ordersCollectMapper;
     @Test
     public void testGetDefaultFreeChapterNum() {
         int defaultFreeChapterNum = bookService.getDefaultFreeChapterNum();
@@ -37,4 +44,31 @@ public class BookServiceImplTest {
         orders.setFinishtime(DateUtils.getNow());
        ordersMapper.updateByPrimaryKeySelective(orders);
     }
+    @Test
+    public void testUpdateOrderCollect() {
+        OrdersCollect ordersCollect = new OrdersCollect();
+        ordersCollect.setAdminId(247);
+        ordersCollect.setType("1");
+        ordersCollect.setFlag("1");
+        ordersCollect.setCreatedate(TimeUtil.getCurrentDate(TimeUtil.YYYYMMDD1));
+        ordersCollect.setRechargeMoney(new BigDecimal(1));
+        ordersCollect.setRechargeMoneyBenefit(new BigDecimal(1));
+        ordersCollect.setNormalRechargeOrdersCount(1);
+        ordersCollect.setNormalRechargeUserCount(1);
+        ordersCollect.setKandianRechargeOrdersCount(1);
+        ordersCollect.setCreatetime(DateUtils.getNow());
+        ordersCollect.setRechargeUserCount(1);
+        ordersCollect.setKandianRechargeOrders(0);
+        OrdersCollectExample ordersCollectExample = OrdersCollectExample.newAndCreateCriteria().andAdminIdEqualTo(ordersCollect.getAdminId())
+                .andTypeEqualTo(ordersCollect.getType()).andFlagEqualTo(ordersCollect.getFlag()).andCreatedateEqualTo(ordersCollect.getCreatedate())
+                .example();
+
+        OrdersCollect selectOrdersCollect = ordersCollectMapper.selectOneByExample(ordersCollectExample);
+        if (selectOrdersCollect==null){
+            ordersCollectMapper.insert(ordersCollect);
+        }else {
+            ordersCollectMapper.updateCollect(ordersCollect);
+        }
+
+    }
 }