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);