Merge remote-tracking branch 'origin/dev_20111115' into dev_20111115

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

@@ -295,7 +295,22 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                 info.setUpdatedAt(nowTime);
             }
         }
-        redisDataUtils.setIntegralActivityDrawList(drawVo.getUserId(), drawVo.getIntegralActivityId(), integralActivityDrawList);
+        redisDataUtils.setIntegralActivityDrawInList(drawVo.getUserId(), drawVo.getIntegralActivityId(), integralActivityDrawList);
+
+        LinkedList<IntegralActivityDrawVo> integralActivityDrawList2 = redisDataUtils.getIntegralActivityDrawList(2, drawVo.getUserId(), drawVo.getIntegralActivityId());
+        for (IntegralActivityDrawVo info : integralActivityDrawList2) {
+            if (info.getDrawId().equals(drawId)) {
+                info.setReceivingAddressesId(receivingAddressesId);
+                info.setReceivingName(receivingName);
+                info.setReceivingPhone(receivingPhone);
+                info.setReceivingProvince(receivingProvince);
+                info.setReceivingCity(receivingCity);
+                info.setReceivingCounty(receivingCounty);
+                info.setReceivingAddress(receivingAddress);
+                info.setUpdatedAt(nowTime);
+            }
+        }
+        redisDataUtils.setIntegralActivityDrawList(drawVo.getUserId(), drawVo.getIntegralActivityId(), integralActivityDrawList2);
 
         // mysql
         LinkedList<String> sqls = CollectionUtil.linkedListString();

liquidnet-bus-service/liquidnet-service-sweet/src/main/java/com/liquidnet/service/sweet/utils/RedisDataUtils.java

@@ -664,7 +664,7 @@ public class RedisDataUtils {
         }
     }
 
-    public void setIntegralActivityDrawList(String uid, String integralActivityId, LinkedList<IntegralActivityDrawVo> integralActivityDrawList) {
+    public void setIntegralActivityDrawInList(String uid, String integralActivityId, LinkedList<IntegralActivityDrawVo> integralActivityDrawList) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_IN_USER
                     .concat(integralActivityId)
                 .concat(SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_USER_KEY)
@@ -672,6 +672,14 @@ public class RedisDataUtils {
         redisUtil.set(redisKey, integralActivityDrawList);
     }
 
+    public void setIntegralActivityDrawList(String uid, String integralActivityId, LinkedList<IntegralActivityDrawVo> integralActivityDrawList) {
+        String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_USER
+                .concat(integralActivityId)
+                .concat(SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_DRAW_USER_KEY)
+                .concat(uid);
+        redisUtil.set(redisKey, integralActivityDrawList);
+    }
+
     public int getIntegralActivityPrizeNum(String integralActivityId, String prizeId) {
         String redisKey = SweetConstant.REDIS_KEY_SWEET_INTEGRAL_ACTIVITY_PRIZE_NUM
                 .concat(integralActivityId)