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

docu/20210927_member_voucher_refund.sql

@@ -274,7 +274,7 @@ create table candy_user_coupon
 (
     mid        bigint unsigned auto_increment primary key,
     ucoupon_id varchar(64) not null,
-    mcoupon_id varchar(64) not null comment '~candy_mgt_coupon.mcoupon_id',
+    mcoupon_id varchar(64) comment '~candy_mgt_coupon.mcoupon_id',
     uid        varchar(64) not null comment '~adam_user.uid',
     coupon_id  varchar(64) not null comment '~candy_coupon.coupon_id',
     state      tinyint comment '用户券状态[1-可用|2-无效｜3-已过期｜5-已使用]',

liquidnet-bus-service/liquidnet-service-adam/liquidnet-service-adam-impl/src/main/java/com/liquidnet/service/adam/service/impl/AdamUserInfoServiceImpl.java

@@ -140,7 +140,7 @@ public class AdamUserInfoServiceImpl implements IAdamUserInfoService {
 
         s = System.currentTimeMillis();
         toMqSqls.add(SqlMapping.get("adam_user.complete"));
-        updateUserObjs.add(new Object[]{1, existUserInfoVo.getUpdatedAt(), existUserInfoVo.getUid()});
+        updateUserObjs.add(new Object[]{existUserInfoVo.getIsComplete(), existUserInfoVo.getUpdatedAt(), existUserInfoVo.getUid()});
         toMqSqls.add(SqlMapping.get("adam_user_info.edit"));
         updateUserInfoObjs.add(new Object[]{
                         existUserInfoVo.getNickname(), sexStr, existUserInfoVo.getBirthday(), existUserInfoVo.getArea(),

liquidnet-bus-service/liquidnet-service-candy/liquidnet-service-candy-impl/docu/db_ln_candy_initialdata.sql

@@ -110,7 +110,7 @@ create table candy_user_coupon
 (
     mid        bigint unsigned auto_increment primary key,
     ucoupon_id varchar(64) not null,
-    mcoupon_id varchar(64) not null comment '~candy_mgt_coupon.mcoupon_id',
+    mcoupon_id varchar(64) comment '~candy_mgt_coupon.mcoupon_id',
     uid        varchar(64) not null comment '~adam_user.uid',
     coupon_id  varchar(64) not null comment '~candy_coupon.coupon_id',
     state      tinyint comment '用户券状态[1-可用|2-无效｜3-已过期｜5-已使用]',