合并分支 'dxy' 到 'qa'

src/main/java/com/wangxiaolu/promotion/domain/lottery/dao/impl/LotteryCoreDaoImpl.java

@@ -92,6 +92,7 @@ public class LotteryCoreDaoImpl implements LotteryCoreDao {
 
         LotteryUserInfo lotteryUserInfo = new LotteryUserInfo();
         lotteryUserInfo = BeanUtils.transitionDto(userInfo, LotteryUserInfo.class);
+        lotteryUserInfo.setOpenId(record.getWxOpenId());
         lotteryUserInfoMapper.insert(lotteryUserInfo);
         // 动态概率
         int prizeLevel = simpleDynamicPrize();

src/main/java/com/wangxiaolu/promotion/utils/TencentMapUtil.java

@@ -50,7 +50,7 @@ public class TencentMapUtil {
         result.put("province", addressInfo.getProvince());
         result.put("city", addressInfo.getCity());
         result.put("district", addressInfo.getDistrict());
-        result.put("address", addressInfo.getFullAddress());
+        result.put("address", addressInfo.getProvince()+addressInfo.getCity()+addressInfo.getDistrict()+addressInfo.getStreet());
         return result;
     }