Merge branch 'develop' into release

tuoheng-api/src/main/java/com/tuoheng/api/entity/domain/WestreamUser.java

@@ -105,9 +105,4 @@ public class WestreamUser extends BaseEntity implements Serializable {
      */
     private Integer isTiktok;
 
-    /**
-     * unionid
-     */
-    private String unionId;
-
 }

tuoheng-api/src/main/java/com/tuoheng/api/service/impl/WxServiceImpl.java

@@ -78,7 +78,7 @@ public class WxServiceImpl implements IWxService {
 
         WestreamUser westreamUser = westreamUserMapper.selectOne(new LambdaQueryWrapper<WestreamUser>()
                 .eq(WestreamUser::getTenantId, tenant.getId())
-                .eq(WestreamUser::getUnionId, wxGetUserPointsQuery.getUnionId())
+                .eq(WestreamUser::getUnionid, wxGetUserPointsQuery.getUnionId())
                 .eq(WestreamUser::getMark, 1));
         if(ObjectUtil.isNotNull(westreamUser)){
             WxGetUserPointsDto wxGetUserPointsDto = new WxGetUserPointsDto()
@@ -105,7 +105,7 @@ public class WxServiceImpl implements IWxService {
         //查询用户
         WestreamUser westreamUser = westreamUserMapper.selectOne(new LambdaQueryWrapper<WestreamUser>()
                 .eq(WestreamUser::getTenantId, tenant.getId())
-                .eq(WestreamUser::getUnionId, wxSubUserPointsRequest.getUnionId())
+                .eq(WestreamUser::getUnionid, wxSubUserPointsRequest.getUnionId())
                 .eq(WestreamUser::getMark, 1));
 
         if (westreamUser.getMallPoints() >= wxSubUserPointsRequest.getPoints()) {