收货地址区分省市县

liquidnet-bus-api/liquidnet-service-sweet-api/src/main/java/com/liquidnet/service/sweet/dto/vo/IntegralActivityDrawVo.java

@@ -53,7 +53,16 @@ public class IntegralActivityDrawVo implements Serializable, Cloneable {
     @ApiModelProperty(value = "adam收货人手机号")
     private String receivingPhone;
 
-    @ApiModelProperty(value = "adam收货人完整地址 空格隔离省市区详细地址")
+    @ApiModelProperty(value = "adam收货人地址省份")
+    private String receivingProvince;
+
+    @ApiModelProperty(value = "adam收货人地址城市")
+    private String receivingCity;
+
+    @ApiModelProperty(value = "adam收货人地址区县")
+    private String receivingCounty;
+
+    @ApiModelProperty(value = "adam收货人详细地址")
     private String receivingAddress;
 
     @ApiModelProperty(value = "发放状态 1未发放 2已发放 3无需发放")

liquidnet-bus-do/liquidnet-service-sweet-do/src/main/java/com/liquidnet/service/sweet/entity/SweetIntegralActivityDraw.java

@@ -7,6 +7,7 @@ import java.io.Serializable;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.liquidnet.commons.lang.util.DateUtil;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -92,6 +93,21 @@ public class SweetIntegralActivityDraw implements Serializable, Cloneable {
      */
     private String receivingPhone;
 
+    /**
+     * adam收货人地址省份
+     */
+    private String receivingProvince;
+
+    /**
+     * adam收货人地址城市
+     */
+    private String receivingCity;
+
+    /**
+     * adam收货人地址区县
+     */
+    private String receivingCounty;
+
     /**
      * adam收货人完整地址 空格隔离省市区详细地址
      */

liquidnet-bus-service/liquidnet-service-sweet/docu/db_sweet_integral_activity_20211020.sql

@@ -72,7 +72,10 @@ CREATE TABLE `sweet_integral_activity_draw`
     `receiving_addresses_id` varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货地址addresses_id',
     `receiving_name`         varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人姓名',
     `receiving_phone`        varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人手机号',
-    `receiving_address`      varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人完整地址 空格隔离省市区详细地址',
+    `receiving_province`     varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人省份',
+    `receiving_city`         varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人城市',
+    `receiving_county`       varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人区县',
+    `receiving_address`      varchar(255)    NOT NULL DEFAULT '' COMMENT 'adam收货人详细地址',
     `receiving_status`       smallint        NOT NULL DEFAULT 1 COMMENT '发放状态 1未发放 2已发放 3无需发放',
     `created_at`             datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `updated_at`             datetime        NULL     DEFAULT CURRENT_TIMESTAMP COMMENT '更新时间',

liquidnet-bus-service/liquidnet-service-sweet/docu/redis_queue_create.txt

@@ -21,10 +21,6 @@ XGROUP CREATE sweet:stream:rk.sweetUserInsert group.sweetUserInsert 0
 XADD sweet:stream:rk.remindInsert * 0 0
 XGROUP CREATE sweet:stream:rk.remindInsert group.remindInsert 0
 
---     小程序登录记录用户解密后信息     --
-XADD sweet:stream:rk.sweetAppletUserInsert * 0 0
-XGROUP CREATE sweet:stream:rk.sweetAppletUserInsert group.sweetAppletUserInsert 0
-
 --     发送模版消息     --
 XADD sweet:stream:rk.sweetTemplateMsg * 0 0
 XGROUP CREATE sweet:stream:rk.sweetTemplateMsg group.sweetTemplateMsg 0

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

@@ -226,10 +226,16 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
         AdamAddressesVo addressesData = queryAddresses.getData();
         String receivingPhone = addressesData.getPhone();
         String receivingName = addressesData.getName();
+        String receivingProvince = addressesData.getProvince();
+        String receivingCity = addressesData.getCity();
+        String receivingCounty = addressesData.getCounty();
         String receivingAddress = addressesData.getAddress();
 
         drawVo.setReceivingName(receivingName);
         drawVo.setReceivingPhone(receivingPhone);
+        drawVo.setReceivingProvince(receivingProvince);
+        drawVo.setReceivingCity(receivingCity);
+        drawVo.setReceivingCounty(receivingCounty);
         drawVo.setReceivingAddress(receivingAddress);
         LocalDateTime nowTime = LocalDateTime.now();
         drawVo.setUpdatedAt(nowTime);
@@ -240,6 +246,9 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
                 new Document("$set", new Document("receivingAddressesId", receivingAddressesId)
                         .append("receivingName", receivingName)
                         .append("receivingPhone", receivingPhone)
+                        .append("receivingProvince", receivingProvince)
+                        .append("receivingCity", receivingCity)
+                        .append("receivingCounty", receivingCounty)
                         .append("receivingAddress", receivingAddress)
                         .append("updatedAt", DateUtil.Formatter.yyyyMMddHHmmss.format(nowTime)))
         );
@@ -249,7 +258,7 @@ public class SweetIntegralActivityDrawServiceImpl extends ServiceImpl<SweetInteg
         LinkedList<Object[]> sqlsDataA = CollectionUtil.linkedListObjectArr();
         sqls.add(SqlMapping.get("integral_activity_draw.update"));
         sqlsDataA.add(new Object[]{
-                receivingAddressesId, receivingName, receivingPhone, receivingAddress, nowTime, drawId
+                receivingAddressesId, receivingName, receivingPhone, receivingAddress, receivingProvince, receivingCity, receivingCounty, nowTime, drawId
         });
         queueUtils.sendMsgByRedis(MQConst.SweetQueue.SWEET_INTEGRAL_ACTIVITY_DRAW.getKey(),
                 SqlMapping.gets(sqls, sqlsDataA));

liquidnet-bus-service/liquidnet-service-sweet/src/main/resources/sqlmap.properties

@@ -48,7 +48,7 @@ sweet_city_vote_stat.update=UPDATE sweet_city_vote_stat SET vote_num = IFNULL(vo
 sweet_antigenic_question.insert=INSERT INTO sweet_antigenic_question (question_id,type,openId,unionId,nickname,address,phone,urgent_phone,keyword1,keyword11,keyword2,keyword3,keyword4,keyword5,keyword6,keyword7) VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 # ------------------------积分抽奖----------------------------
 integral_activity_draw.insert=INSERT INTO sweet_integral_activity_draw (draw_id,integral_activity_id,activity_num,prize_id,prize_title,prize_type,prize_type_num,relation_id,user_id,nickname,receiving_status) VALUES (?,?,?,?,?,?,?,?,?,?,?)
-integral_activity_draw.update=UPDATE sweet_integral_activity_draw SET receiving_addresses_id = ?, receiving_name = ?, receiving_phone = ?, receiving_address = ?, updated_at = ? WHERE draw_id = ?
+integral_activity_draw.update=UPDATE sweet_integral_activity_draw SET receiving_addresses_id = ?, receiving_name = ?, receiving_phone = ?, receiving_address = ?, receiving_province = ?, receiving_city = ?, receiving_county = ?, updated_at = ? WHERE draw_id = ?
 
 # --------------------------微信用户信息表包含小程序公众号--------------------------
 sweet_wechat_users_applet.insert=INSERT INTO sweet_wechat_users (wechat_id,open_id,union_id,phone_number,pure_phone_number,country_code,type) VALUES (?,?,?,?,?,?,?)