Commit 4c519e34 by 吕明尚

会员用户增加字段

parent 682ca036
...@@ -1177,8 +1177,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -1177,8 +1177,10 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
memberProgressLog.setExpirationTime(DateUtils.addYears(new Date(), memberProgressLog.setExpirationTime(DateUtils.addYears(new Date(),
Math.toIntExact(memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>(). Math.toIntExact(memberConfigService.getOne(new LambdaQueryWrapper<MemberConfig>().
eq(MemberConfig::getId, consumerMember.getMemberConfigId())).getValidityPeriod()))); eq(MemberConfig::getId, consumerMember.getMemberConfigId())).getValidityPeriod())));
if (!consumerMember.getMemberType().equals(MemberTypeEnum.NORMAL.getIndex())) {
memberProgressLogService.save(memberProgressLog); memberProgressLogService.save(memberProgressLog);
consumerMemberService.updateConsumerMember(consumerMember); consumerMemberService.updateConsumerMember(consumerMember);
}
// } // }
} }
} }
...@@ -1947,10 +1949,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -1947,10 +1949,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
.eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel())); .eq(MemberConfig::getMembershipLevel, consumerMember.getMembershipLevel()));
if (ObjectUtil.isNotEmpty(memberConfigServiceOne)) { if (ObjectUtil.isNotEmpty(memberConfigServiceOne)) {
consumerMember.setMemberConfigId(memberConfigServiceOne.getId()); consumerMember.setMemberConfigId(memberConfigServiceOne.getId());
} else {
consumerMember.setMemberType(MemberTypeEnum.NORMAL.getIndex());
} }
} }
} }
memberProgressLog.setVariableProgress(sOrder.getBalance()); memberProgressLog.setVariableProgress(sOrder.getBalance());
......
...@@ -15,6 +15,8 @@ ...@@ -15,6 +15,8 @@
<result property="memberConfigId" column="member_config_id"/> <result property="memberConfigId" column="member_config_id"/>
<result property="expirationDate" column="expiration_date"/> <result property="expirationDate" column="expiration_date"/>
<result property="membershipProgress" column="membership_progress"/> <result property="membershipProgress" column="membership_progress"/>
<result property="isRecharge" column="is_recharge"/>
<result property="isRight" column="is_right"/>
<result property="isDelete" column="is_delete"/> <result property="isDelete" column="is_delete"/>
<result property="createBy" column="create_by"/> <result property="createBy" column="create_by"/>
<result property="createTime" column="create_time"/> <result property="createTime" column="create_time"/>
...@@ -31,6 +33,8 @@ ...@@ -31,6 +33,8 @@
member_config_id, member_config_id,
expiration_date, expiration_date,
membership_progress, membership_progress,
is_recharge,
is_right,
is_delete, is_delete,
create_by, create_by,
create_time, create_time,
...@@ -51,6 +55,8 @@ ...@@ -51,6 +55,8 @@
m.member_config_id, m.member_config_id,
m.expiration_date, m.expiration_date,
m.membership_progress, m.membership_progress,
m.is_recharge,
m.is_right,
m.is_delete, m.is_delete,
m.create_by, m.create_by,
m.create_time, m.create_time,
...@@ -87,6 +93,8 @@ ...@@ -87,6 +93,8 @@
m.member_config_id, m.member_config_id,
m.expiration_date, m.expiration_date,
m.membership_progress, m.membership_progress,
m.is_recharge,
m.is_right,
m.is_delete, m.is_delete,
m.create_by, m.create_by,
m.create_time, m.create_time,
...@@ -108,6 +116,8 @@ ...@@ -108,6 +116,8 @@
<if test="memberConfigId != null">member_config_id,</if> <if test="memberConfigId != null">member_config_id,</if>
<if test="expirationDate != null">expiration_date,</if> <if test="expirationDate != null">expiration_date,</if>
<if test="membershipProgress != null">membership_progress,</if> <if test="membershipProgress != null">membership_progress,</if>
<if test="isRecharge != null">is_recharge,</if>
<if test="isRight != null">is_right,</if>
<if test="isDelete != null">is_delete,</if> <if test="isDelete != null">is_delete,</if>
<if test="createBy != null">create_by,</if> <if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if> <if test="createTime != null">create_time,</if>
...@@ -122,6 +132,8 @@ ...@@ -122,6 +132,8 @@
<if test="memberConfigId != null">#{memberConfigId},</if> <if test="memberConfigId != null">#{memberConfigId},</if>
<if test="expirationDate != null">#{expirationDate},</if> <if test="expirationDate != null">#{expirationDate},</if>
<if test="membershipProgress != null">#{membershipProgress},</if> <if test="membershipProgress != null">#{membershipProgress},</if>
<if test="isRecharge != null">#{isRecharge},</if>
<if test="isRight != null">#{isRight},</if>
<if test="isDelete != null">#{isDelete},</if> <if test="isDelete != null">#{isDelete},</if>
<if test="createBy != null">#{createBy},</if> <if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if> <if test="createTime != null">#{createTime},</if>
...@@ -140,6 +152,8 @@ ...@@ -140,6 +152,8 @@
<if test="memberConfigId != null">member_config_id = #{memberConfigId},</if> <if test="memberConfigId != null">member_config_id = #{memberConfigId},</if>
<if test="expirationDate != null">expiration_date = #{expirationDate},</if> <if test="expirationDate != null">expiration_date = #{expirationDate},</if>
<if test="membershipProgress != null">membership_progress = #{membershipProgress},</if> <if test="membershipProgress != null">membership_progress = #{membershipProgress},</if>
<if test="isRecharge != null">is_recharge = #{isRecharge},</if>
<if test="isRight != null">is_right = #{isRight},</if>
<if test="isDelete != null">is_delete = #{isDelete},</if> <if test="isDelete != null">is_delete = #{isDelete},</if>
<if test="createBy != null">create_by = #{createBy},</if> <if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if> <if test="createTime != null">create_time = #{createTime},</if>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment