新增是否可售字段2

ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java

@@ -299,7 +299,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
             if (!dto.getIsOnSale() && oldItem.getType().intValue() == DistributionEnum.DistributionTypeEnum.COLLECT.getCode()) {
                 //下架用户商品,短信通知，跳转到藏品详情页
                 String url = wxAppletApi.getUrlLink("/pages/detail/index","itemId=" + dto.getId() + "&shareRecordId=");
-                String msg = "您正在出售的" + supplierItem.getName() +  "，根据平台规定不得售卖该类藏品，平台已为您关闭出售，请前往"+ url + "查看";
+                String msg = "您正在出售的" + oldItem.getName() +  "，根据平台规定不得售卖该类藏品，平台已为您关闭出售，请前往"+ url + "查看";
                 aliSmsSender.sendSms(oldItem.getCreatorId(), msg);
             }
             return Result.success();
@@ -340,7 +340,7 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
             supplierItemDao.update(supplierItem);
             //发送短息通知用户商品违规被下架，跳转到个人藏馆
             String url = wxAppletApi.getUrlLink("/pages/saleSelf/index","userId=" + oldItem.getCreatorId() + "&shareRecordId=");
-            String msg = "您发布的" + supplierItem.getName() + "，内容涉嫌违反平台规定，已被平台下架，请前往"+ url + "查看";
+            String msg = "您发布的" + oldItem.getName() + "，内容涉嫌违反平台规定，已被平台下架，请前往"+ url + "查看";
             aliSmsSender.sendSms(oldItem.getCreatorId(), msg);
             return Result.success();
         } catch (Exception e) {

ch-dao/src/main/java/com/wwdz/ch/db/impl/distribution/SupplierItemDaoImpl.java

@@ -41,6 +41,7 @@ public class SupplierItemDaoImpl implements SupplierItemDao {
         JdbcHelper.ifPresent(dto.getStatus(), criteria::andStatusEqualTo);
         JdbcHelper.ifPresent(dto.getStock(), criteria::andStockGreaterThan);
         JdbcHelper.ifPresent(dto.getIsOnSale(), criteria::andIsOnSaleEqualTo);
+        JdbcHelper.ifPresent(dto.getIsAbleSale(), criteria::andIsAbleSaleEqualTo);
         JdbcHelper.ifPresent(dto.getIsDeleted(), criteria::andIsDeletedEqualTo);
         JdbcHelper.ifPresent(dto.getCreatorId(), criteria::andCreatorIdEqualTo);
         supplierItemExample.setOrderByClause(" create_time desc");

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/UserServiceImpl.java

@@ -176,6 +176,7 @@ public class UserServiceImpl implements UserService {
         com.wwdz.user.api.model.user.User wUser = userCloudServerResponse.getResult();
         User user = User.of(wUser);
         user.setId(dto.getUserId());
+        user.setStatus(UserEnum.StatusEnum.COMMON.getCode());
         logger.info(">>>>>>> 登录用户的信息:{}", JsonUtils.from(user));
 
         String phone = user.getMobile();