Merge branch 'dev_stone' into dev_20111115

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/constant/SweetConstant.java

@@ -54,7 +54,7 @@ public class SweetConstant {
     public final static String REDIS_KEY_SWEET_WECHAT_USER_UNIONID_UID_MODERNSKY = "sweet:wechatUser:modernsky:uid:";
     // 微信用户相关 新
     public final static String REDIS_KEY_SWEET_WECHAT_USERS = "sweet:wechat:users:unionId:";
-    public final static String REDIS_KEY_SWEET_WECHAT_USERS_TYPE = "type:";
+    public final static String REDIS_KEY_SWEET_WECHAT_USERS_TYPE = ":type:";
     public final static String REDIS_KEY_SWEET_WECHAT_USERS_RELATION_PHONE = "sweet:wechat:usersRelation:mobile:";
     public final static String REDIS_KEY_SWEET_WECHAT_USERS_RELATION_UNIONID = "sweet:wechat:usersRelation:unionId:";
 }

liquidnet-bus-client/liquidnet-client-admin/liquidnet-client-admin-web/src/main/resources/templates/zhengzai/sweet/integralActivityDraw/list.html

@@ -104,7 +104,14 @@
                 },
                 {
                     field: 'receivingAddress',
-                    title: '收货人姓名地址'
+                    title: '收货人地址',
+                    formatter: function (value, row) {
+                        var receivingProvince = row.receivingProvince;
+                        var receivingCity = row.receivingCity;
+                        var receivingCounty = row.receivingCounty;
+                        var receivingAddress = row.receivingAddress;
+                        return receivingProvince + ' ' + receivingCity + ' ' + receivingCounty + ' ' + receivingAddress;
+                    }
                 },
                 {
                     field: 'receivingStatus',

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/resources/com.liquidnet.service.sweet.mapper/SweetIntegralActivityDrawMapper.xml

@@ -3,7 +3,7 @@
 <mapper namespace="com.liquidnet.service.sweet.mapper.SweetIntegralActivityDrawMapper">
 
     <select id="selectExcelList" resultType="com.liquidnet.service.sweet.dto.SweetActivityDrawListDao">
-        select a.*
+        select a.*, CONCAT(a.receiving_province,a.receiving_city,a.receiving_county,a.receiving_address) as receiving_address
         from sweet_integral_activity_draw as a
         left join sweet_integral_activity_prize as b on b.prize_id = a.prize_id
         left join sweet_integral_activity as c on a.integral_activity_id = c.integral_activity_id

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/controller/syncRedis/UserDataController.java

@@ -81,11 +81,12 @@ public class UserDataController {
     @GetMapping("user")
     @ApiOperation("以openid同步单个关注服务号的用户")
     @ApiImplicitParams({
-            @ApiImplicitParam(type = "query", dataType = "String", name = "openId", value = "openId", required = true)
+            @ApiImplicitParam(type = "query", dataType = "String", name = "openId", value = "openId", required = true),
+            @ApiImplicitParam(type = "query", dataType = "Integer", name = "type", value = "type 1正在 2摩登", required = true)
     })
-    public void getUser(@RequestParam() String openId) {
+    public void getUser(@RequestParam() String openId, @RequestParam() Integer type) {
         try {
-            userDataService.getUser(openId);
+            userDataService.getUser(openId, type);
         } catch (Exception e) {
             log.error("getUser", e);
         }

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/SweetWechatLoginServiceImpl.java

@@ -95,6 +95,8 @@ public class SweetWechatLoginServiceImpl {
                 sweetWechatUsersVo.setPurePhoneNumber(purePhoneNumber);
                 sweetWechatUsersVo.setCountryCode(countryCode);
                 sweetWechatUsersVo.setType(userType);
+                sweetWechatUsersVo.setOpenId(openId);
+                sweetWechatUsersVo.setUnionId(unionId);
                 redisUtils.setSweetWechatUsers(sweetWechatUsersVo);
             }
             SweetWechatUsersRelationVo sweetWechatUsersRelation = redisUtils.getSweetWechatUsersRelation(mobile);

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/service/impl/syncRedis/UserDataServiceImpl.java

@@ -6,9 +6,10 @@ import com.liquidnet.commons.lang.util.IDGenerator;
 import com.liquidnet.service.base.SqlMapping;
 import com.liquidnet.service.base.constant.MQConst;
 import com.liquidnet.service.sweet.config.WechatMpConfigure;
-import com.liquidnet.service.sweet.entity.SweetWechatUser;
 import com.liquidnet.service.sweet.utils.QueueUtils;
 import com.liquidnet.service.sweet.utils.RedisDataUtils;
+import com.liquidnet.service.sweet.utils.WechatUsersRedisUtils;
+import com.liquidnet.service.sweet.vo.SweetWechatUsersVo;
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.error.WxErrorException;
 import me.chanjar.weixin.mp.api.WxMpService;
@@ -27,7 +28,7 @@ public class UserDataServiceImpl {
     WechatMpConfigure wechatMpConfigure;
 
     @Autowired
-    private RedisDataUtils redisDataUtils;
+    private WechatUsersRedisUtils redisUtils;
     @Autowired
     private QueueUtils queueUtils;
 
@@ -53,68 +54,36 @@ public class UserDataServiceImpl {
                         log.info("getSubscribeFalse：openId：[{}]", openId);
                         continue;
                     }
-                    if (type == 1) {
-                        SweetWechatUser userInfo = redisDataUtils.getSweetWechatUser(wxMpUser.getUnionId());
-                        if (null == userInfo) {
-                            SweetWechatUser sweetWechatUser = SweetWechatUser.getNew();
-                            sweetWechatUser.setOpenId(wxMpUser.getOpenId());
-                            sweetWechatUser.setUnionId(wxMpUser.getUnionId());
-                            sweetWechatUser.setNickname(wxMpUser.getNickname());
-                            sweetWechatUser.setSexDesc(wxMpUser.getSexDesc());
-                            sweetWechatUser.setSex(wxMpUser.getSex());
-                            sweetWechatUser.setHeadImgUrl(wxMpUser.getHeadImgUrl());
-                            sweetWechatUser.setLanguage(wxMpUser.getLanguage());
-                            sweetWechatUser.setCountry(wxMpUser.getCountry());
-                            sweetWechatUser.setProvince(wxMpUser.getProvince());
-                            sweetWechatUser.setCity(wxMpUser.getCity());
-                            sweetWechatUser.setSubscribeTime(DateUtil.ofEpochMilli(wxMpUser.getSubscribeTime()));
-                            sweetWechatUser.setSubscribeScene(wxMpUser.getSubscribeScene());
-                            sweetWechatUser.setUserId(IDGenerator.nextSnowId());
-                            LinkedList<String> sqls = CollectionUtil.linkedListString();
-                            LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-                            sqls.add(SqlMapping.get("sweet_user.insert"));
-                            sqlsDataA.add(new Object[]{
-                                    sweetWechatUser.getUserId(), 1, sweetWechatUser.getOpenId(), sweetWechatUser.getUnionId(), sweetWechatUser.getNickname(),
-                                    sweetWechatUser.getSexDesc(), sweetWechatUser.getSex(), sweetWechatUser.getHeadImgUrl(), sweetWechatUser.getLanguage(),
-                                    sweetWechatUser.getCountry(), sweetWechatUser.getProvince(), sweetWechatUser.getCity(),
-                                    sweetWechatUser.getSubscribeTime(), sweetWechatUser.getSubscribeScene()
-                            });
-                            queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_USER_INSERT.getKey(),
-                                    SqlMapping.gets(sqls, sqlsDataA));
-                            // 入缓存
-                            redisDataUtils.setSweetWechatUser(sweetWechatUser);
-                        }
-                    } else if (type == 2) {
-                        SweetWechatUser userInfo = redisDataUtils.getSweetWechatUserModernsky(wxMpUser.getUnionId());
-                        if (null == userInfo) {
-                            SweetWechatUser sweetWechatUser = SweetWechatUser.getNew();
-                            sweetWechatUser.setOpenId(wxMpUser.getOpenId());
-                            sweetWechatUser.setUnionId(wxMpUser.getUnionId());
-                            sweetWechatUser.setNickname(wxMpUser.getNickname());
-                            sweetWechatUser.setSexDesc(wxMpUser.getSexDesc());
-                            sweetWechatUser.setSex(wxMpUser.getSex());
-                            sweetWechatUser.setHeadImgUrl(wxMpUser.getHeadImgUrl());
-                            sweetWechatUser.setLanguage(wxMpUser.getLanguage());
-                            sweetWechatUser.setCountry(wxMpUser.getCountry());
-                            sweetWechatUser.setProvince(wxMpUser.getProvince());
-                            sweetWechatUser.setCity(wxMpUser.getCity());
-                            sweetWechatUser.setSubscribeTime(DateUtil.ofEpochMilli(wxMpUser.getSubscribeTime()));
-                            sweetWechatUser.setSubscribeScene(wxMpUser.getSubscribeScene());
-                            sweetWechatUser.setUserId(IDGenerator.nextSnowId());
-                            LinkedList<String> sqls = CollectionUtil.linkedListString();
-                            LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-                            sqls.add(SqlMapping.get("sweet_user.insert"));
-                            sqlsDataA.add(new Object[]{
-                                    sweetWechatUser.getUserId(), 2, sweetWechatUser.getOpenId(), sweetWechatUser.getUnionId(), sweetWechatUser.getNickname(),
-                                    sweetWechatUser.getSexDesc(), sweetWechatUser.getSex(), sweetWechatUser.getHeadImgUrl(), sweetWechatUser.getLanguage(),
-                                    sweetWechatUser.getCountry(), sweetWechatUser.getProvince(), sweetWechatUser.getCity(),
-                                    sweetWechatUser.getSubscribeTime(), sweetWechatUser.getSubscribeScene()
-                            });
-                            queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_USER_INSERT.getKey(),
-                                    SqlMapping.gets(sqls, sqlsDataA));
-                            // 入缓存
-                            redisDataUtils.setSweetWechatUserModernsky(sweetWechatUser);
-                        }
+                    SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsers(wxMpUser.getUnionId(), type);
+                    if (null == sweetWechatUsers) {
+                        SweetWechatUsersVo sweetWechatUsersVo = SweetWechatUsersVo.getNew();
+                        sweetWechatUsersVo.setWechatId(IDGenerator.nextSnowId());
+                        sweetWechatUsersVo.setOpenId(wxMpUser.getOpenId());
+                        sweetWechatUsersVo.setUnionId(wxMpUser.getUnionId());
+                        sweetWechatUsersVo.setNickname(wxMpUser.getNickname());
+                        sweetWechatUsersVo.setSexDesc(wxMpUser.getSexDesc());
+                        sweetWechatUsersVo.setSex(wxMpUser.getSex());
+                        sweetWechatUsersVo.setHeadImgUrl(wxMpUser.getHeadImgUrl());
+                        sweetWechatUsersVo.setLanguage(wxMpUser.getLanguage());
+                        sweetWechatUsersVo.setCountry(wxMpUser.getCountry());
+                        sweetWechatUsersVo.setProvince(wxMpUser.getProvince());
+                        sweetWechatUsersVo.setCity(wxMpUser.getCity());
+                        sweetWechatUsersVo.setSubscribeTime(DateUtil.ofEpochMilli(wxMpUser.getSubscribeTime()));
+                        sweetWechatUsersVo.setSubscribeScene(wxMpUser.getSubscribeScene());
+
+                        LinkedList<String> sqls = CollectionUtil.linkedListString();
+                        LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
+                        sqls.add(SqlMapping.get("sweet_wechat_users_service.insert"));
+                        sqlsDataA.add(new Object[]{
+                                sweetWechatUsersVo.getWechatId(), type, sweetWechatUsersVo.getOpenId(), sweetWechatUsersVo.getUnionId(), sweetWechatUsersVo.getNickname(),
+                                sweetWechatUsersVo.getSexDesc(), sweetWechatUsersVo.getSex(), sweetWechatUsersVo.getHeadImgUrl(), sweetWechatUsersVo.getLanguage(),
+                                sweetWechatUsersVo.getCountry(), sweetWechatUsersVo.getProvince(), sweetWechatUsersVo.getCity(),
+                                sweetWechatUsersVo.getSubscribeTime(), sweetWechatUsersVo.getSubscribeScene()
+                        });
+                        queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_USER_INSERT.getKey(),
+                                SqlMapping.gets(sqls, sqlsDataA));
+                        // 入缓存
+                        redisUtils.setSweetWechatUsers(sweetWechatUsersVo);
                     }
 
                 } catch (Exception e) {
@@ -126,40 +95,41 @@ public class UserDataServiceImpl {
         log.info("同步微信用户完成");
     }
 
-    public void getUser(String openId) throws WxErrorException {
-        WxMpService wxMpService = wechatMpConfigure.getWxMpService(1);
+    public void getUser(String openId, Integer type) throws WxErrorException {
+        WxMpService wxMpService = wechatMpConfigure.getWxMpService(type);
         WxMpUser wxMpUser = wxMpService.getUserService().userInfo(openId);
         log.info("openId：[{}],wxMpUsers：[{}]", openId, wxMpUser);
 
-        SweetWechatUser userInfo = redisDataUtils.getSweetWechatUser(wxMpUser.getUnionId());
-        if (null == userInfo) {
-            SweetWechatUser sweetWechatUser = SweetWechatUser.getNew();
-            sweetWechatUser.setOpenId(wxMpUser.getOpenId());
-            sweetWechatUser.setUnionId(wxMpUser.getUnionId());
-            sweetWechatUser.setNickname(wxMpUser.getNickname());
-            sweetWechatUser.setSexDesc(wxMpUser.getSexDesc());
-            sweetWechatUser.setSex(wxMpUser.getSex());
-            sweetWechatUser.setHeadImgUrl(wxMpUser.getHeadImgUrl());
-            sweetWechatUser.setLanguage(wxMpUser.getLanguage());
-            sweetWechatUser.setCountry(wxMpUser.getCountry());
-            sweetWechatUser.setProvince(wxMpUser.getProvince());
-            sweetWechatUser.setCity(wxMpUser.getCity());
-            sweetWechatUser.setSubscribeTime(DateUtil.ofEpochMilli(wxMpUser.getSubscribeTime()));
-            sweetWechatUser.setSubscribeScene(wxMpUser.getSubscribeScene());
-            sweetWechatUser.setUserId(IDGenerator.nextSnowId());
+        SweetWechatUsersVo sweetWechatUsers = redisUtils.getSweetWechatUsers(wxMpUser.getUnionId(), type);
+        if (null == sweetWechatUsers) {
+            SweetWechatUsersVo sweetWechatUsersVo = SweetWechatUsersVo.getNew();
+            sweetWechatUsersVo.setWechatId(IDGenerator.nextSnowId());
+            sweetWechatUsersVo.setOpenId(wxMpUser.getOpenId());
+            sweetWechatUsersVo.setUnionId(wxMpUser.getUnionId());
+            sweetWechatUsersVo.setNickname(wxMpUser.getNickname());
+            sweetWechatUsersVo.setSexDesc(wxMpUser.getSexDesc());
+            sweetWechatUsersVo.setSex(wxMpUser.getSex());
+            sweetWechatUsersVo.setHeadImgUrl(wxMpUser.getHeadImgUrl());
+            sweetWechatUsersVo.setLanguage(wxMpUser.getLanguage());
+            sweetWechatUsersVo.setCountry(wxMpUser.getCountry());
+            sweetWechatUsersVo.setProvince(wxMpUser.getProvince());
+            sweetWechatUsersVo.setCity(wxMpUser.getCity());
+            sweetWechatUsersVo.setSubscribeTime(DateUtil.ofEpochMilli(wxMpUser.getSubscribeTime()));
+            sweetWechatUsersVo.setSubscribeScene(wxMpUser.getSubscribeScene());
+
             LinkedList<String> sqls = CollectionUtil.linkedListString();
             LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
-            sqls.add(SqlMapping.get("sweet_user.insert"));
+            sqls.add(SqlMapping.get("sweet_wechat_users_service.insert"));
             sqlsDataA.add(new Object[]{
-                    sweetWechatUser.getUserId(), sweetWechatUser.getOpenId(), sweetWechatUser.getUnionId(), sweetWechatUser.getNickname(),
-                    sweetWechatUser.getSexDesc(), sweetWechatUser.getSex(), sweetWechatUser.getHeadImgUrl(), sweetWechatUser.getLanguage(),
-                    sweetWechatUser.getCountry(), sweetWechatUser.getProvince(), sweetWechatUser.getCity(),
-                    sweetWechatUser.getSubscribeTime(), sweetWechatUser.getSubscribeScene()
+                    sweetWechatUsersVo.getWechatId(), type, sweetWechatUsersVo.getOpenId(), sweetWechatUsersVo.getUnionId(), sweetWechatUsersVo.getNickname(),
+                    sweetWechatUsersVo.getSexDesc(), sweetWechatUsersVo.getSex(), sweetWechatUsersVo.getHeadImgUrl(), sweetWechatUsersVo.getLanguage(),
+                    sweetWechatUsersVo.getCountry(), sweetWechatUsersVo.getProvince(), sweetWechatUsersVo.getCity(),
+                    sweetWechatUsersVo.getSubscribeTime(), sweetWechatUsersVo.getSubscribeScene()
             });
             queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_WECHAT_USER_INSERT.getKey(),
                     SqlMapping.gets(sqls, sqlsDataA));
             // 入缓存
-            redisDataUtils.setSweetWechatUser(sweetWechatUser);
+            redisUtils.setSweetWechatUsers(sweetWechatUsersVo);
         }
     }
 }