diff --git a/docs/databases/mallplus1-pms-modify.sql b/docs/databases/mallplus1-pms-modify.sql new file mode 100644 index 0000000..1eb0f2f --- /dev/null +++ b/docs/databases/mallplus1-pms-modify.sql @@ -0,0 +1,3 @@ + +ALTER TABLE pms_brand ADD qssl int default 0 COMMENT '起始销售数量'; +ALTER TABLE pms_brand ADD dgxy varchar(255) DEFAULT NULL COMMENT '订购协议'; \ No newline at end of file diff --git a/docs/databases/修改商品信息表.sql b/docs/databases/修改商品信息表.sql new file mode 100644 index 0000000..3f9ee8c --- /dev/null +++ b/docs/databases/修改商品信息表.sql @@ -0,0 +1,5 @@ + +ALTER TABLE lpk_goods ADD brandId bigint default NULL COMMENT '品牌ID'; +ALTER TABLE lpk_goods ADD brandName varchar(255) DEFAULT NULL COMMENT '品牌名称'; +ALTER TABLE lpk_goods ADD categoryId bigint DEFAULT NULL COMMENT '类别ID'; +ALTER TABLE lpk_goods ADD categoryName varchar(255) DEFAULT NULL COMMENT '类别名称'; \ No newline at end of file diff --git a/src/main/java/com/yxt/yythmall/adminapi/AdminMallRest.java b/src/main/java/com/yxt/yythmall/adminapi/AdminMallRest.java new file mode 100644 index 0000000..e0c50ef --- /dev/null +++ b/src/main/java/com/yxt/yythmall/adminapi/AdminMallRest.java @@ -0,0 +1,33 @@ +package com.yxt.yythmall.adminapi; + +import com.yxt.common.core.result.ResultBean; +import com.yxt.yythmall.adminapi.vo.PmsBrandVo; +import com.yxt.yythmall.adminapi.vo.PmsProductCategoryVo; +import com.yxt.yythmall.adminservice.AdminMallService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@RestController("com.yxt.yythmall.adminapi.AdminMallRest") +@RequestMapping("/adminapi/mall") +public class AdminMallRest { + + @Autowired + private AdminMallService adminMallService; + + @GetMapping(value = "/listAllBrand") + public ResultBean> listAllBrand() { + ResultBean rb = ResultBean.fireFail(); + List list = adminMallService.listBrand(); + return rb.success().setData(list); + } + @GetMapping(value = "/listAllCategory") + public ResultBean> listAllCategory() { + ResultBean rb = ResultBean.fireFail(); + List list = adminMallService.listAllCategory(); + return rb.success().setData(list); + } +} diff --git a/src/main/java/com/yxt/yythmall/adminapi/vo/PmsBrandVo.java b/src/main/java/com/yxt/yythmall/adminapi/vo/PmsBrandVo.java new file mode 100644 index 0000000..575e469 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/adminapi/vo/PmsBrandVo.java @@ -0,0 +1,31 @@ +package com.yxt.yythmall.adminapi.vo; + + +import com.baomidou.mybatisplus.annotation.TableField; +import lombok.Data; + +@Data +public class PmsBrandVo { + + private Long id; + + private String name; + private Integer sort; + /** + * 起始销售数量 + */ + private Integer qssl; + /** + * 订购协议 + */ + private String dgxy; + /** + * 品牌logo + */ + private String logo; + + /** + * 专区大图 + */ + private String bigPic; +} diff --git a/src/main/java/com/yxt/yythmall/adminapi/vo/PmsProductCategoryVo.java b/src/main/java/com/yxt/yythmall/adminapi/vo/PmsProductCategoryVo.java new file mode 100644 index 0000000..7acfcfa --- /dev/null +++ b/src/main/java/com/yxt/yythmall/adminapi/vo/PmsProductCategoryVo.java @@ -0,0 +1,25 @@ +package com.yxt.yythmall.adminapi.vo; + +import lombok.Data; + +@Data +public class PmsProductCategoryVo { + private Long id; + private Long parentId; + + private String name; + private Integer level; + private Integer sort; + + /** + * 图标 + */ + private String icon; + + private String keywords; + + /** + * 描述 + */ + private String description; +} diff --git a/src/main/java/com/yxt/yythmall/adminservice/AdminMallMapper.java b/src/main/java/com/yxt/yythmall/adminservice/AdminMallMapper.java new file mode 100644 index 0000000..db8e0f0 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/adminservice/AdminMallMapper.java @@ -0,0 +1,20 @@ +package com.yxt.yythmall.adminservice; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.yxt.yythmall.adminapi.vo.PmsBrandVo; +import com.yxt.yythmall.adminapi.vo.PmsProductCategoryVo; +import com.yxt.yythmall.api.lpkgoods.LpkGoods; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +@Mapper +public interface AdminMallMapper extends BaseMapper { + + @Select("select * from pms_brand ") + List listBrand(); + + @Select("select * from pms_product_category where parent_id=0 ") + List listAllCategory(); +} diff --git a/src/main/java/com/yxt/yythmall/adminservice/AdminMallService.java b/src/main/java/com/yxt/yythmall/adminservice/AdminMallService.java new file mode 100644 index 0000000..eebc9e1 --- /dev/null +++ b/src/main/java/com/yxt/yythmall/adminservice/AdminMallService.java @@ -0,0 +1,22 @@ +package com.yxt.yythmall.adminservice; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.yxt.yythmall.adminapi.vo.PmsBrandVo; +import com.yxt.yythmall.adminapi.vo.PmsProductCategoryVo; +import com.yxt.yythmall.api.lpkgoods.LpkGoods; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class AdminMallService extends ServiceImpl { + + + public List listBrand() { + return baseMapper.listBrand(); + } + + public List listAllCategory() { + return baseMapper.listAllCategory(); + } +} diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoods.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoods.java index 909649b..0901dbb 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoods.java +++ b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoods.java @@ -36,4 +36,9 @@ public class LpkGoods { private String content; private String weight; private String useTo; + + private Long brandId; // 品牌ID'; + private String brandName; // 品牌名称'; + private Long categoryId; // 类别ID'; + private String categoryName; // 类别名称'; } diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java index 6c70388..df293d3 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java +++ b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDetailsVo.java @@ -26,4 +26,10 @@ public class LpkGoodsDetailsVo implements Vo { private double number; private String content; private String weight; + + + private Long brandId; // 品牌ID'; + private String brandName; // 品牌名称'; + private Long categoryId; // 类别ID'; + private String categoryName; // 类别名称'; } diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDto.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDto.java index 386632a..d712763 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDto.java +++ b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsDto.java @@ -26,4 +26,9 @@ public class LpkGoodsDto implements Dto { private String content; private String weight; private String useTo; + + private Long brandId; // 品牌ID'; + private String brandName; // 品牌名称'; + private Long categoryId; // 类别ID'; + private String categoryName; // 类别名称'; } diff --git a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsVo.java b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsVo.java index 48188f5..dc83a7e 100644 --- a/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsVo.java +++ b/src/main/java/com/yxt/yythmall/api/lpkgoods/LpkGoodsVo.java @@ -36,4 +36,8 @@ public class LpkGoodsVo implements Vo { private String useTo; private String weight; + private Long brandId; // 品牌ID'; + private String brandName; // 品牌名称'; + private Long categoryId; // 类别ID'; + private String categoryName; // 类别名称'; } diff --git a/src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/impl/PmsProductServiceImpl.java b/src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/impl/PmsProductServiceImpl.java index c5ce402..0cbcbcb 100644 --- a/src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/impl/PmsProductServiceImpl.java +++ b/src/main/java/com/yxt/yythmall/mallplus/biz/pms/service/impl/PmsProductServiceImpl.java @@ -12,11 +12,8 @@ import com.yxt.yythmall.mallplus.mbg.pms.vo.PmsProductResult; //import com.zscat.mallplus.sys.entity.SysUser; //import com.zscat.mallplus.ums.service.RedisService; import com.yxt.yythmall.mallplus.biz.util.DateUtils; -import com.yxt.yythmall.mallplus.biz.util.JsonUtil; -import com.yxt.yythmall.mallplus.biz.util.UserUtils; import com.zscat.mallplus.utils.IdWorker; import com.zscat.mallplus.utils.ValidatorUtils; -import com.zscat.mallplus.vo.Rediskey; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Service; import org.springframework.util.CollectionUtils; @@ -182,7 +179,8 @@ public class PmsProductServiceImpl extends ServiceImpl { List listByDate(@Param("date") String date, @Param("type") Integer type); List selectByTags(@Param("tags") String tags); + + PmsProductResult getUpdateInfoLiu1(Long id); } diff --git a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsProductMapper.xml b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsProductMapper.xml index 7d64843..d1737dd 100644 --- a/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsProductMapper.xml +++ b/src/main/java/com/yxt/yythmall/mallplus/mbg/pms/mapper/PmsProductMapper.xml @@ -226,4 +226,50 @@ select id, brand_id, product_category_id, product_attribute_category_id, name,area_id, pic , sale, price, original_price , weight from pms_product where find_in_set(#{tags}, tags) and publish_status=1 and verify_status=1 + + + + + + + + + + + + + + + + + + diff --git a/src/main/java/com/zscat/mallplus/enums/ConstansValue.java b/src/main/java/com/zscat/mallplus/enums/ConstansValue.java index 59d3789..f15df9d 100644 --- a/src/main/java/com/zscat/mallplus/enums/ConstansValue.java +++ b/src/main/java/com/zscat/mallplus/enums/ConstansValue.java @@ -12,7 +12,13 @@ public class ConstansValue { "information_schema.tables", "oms_payments", "oms_order_return_reason", "sys_role", "ums_integration_consume_setting", "sys_user", "sys_store", "sys_area", "sys_school", "sys_permission", "pms_product_attribute", "pms_product_category_attribute_relation", "pms_product_attribute_value", "pms_product_category_attribute_relation", "admin_day_statics", "ums_member_tag","sys_store_rank", "pms_small_navicon_category", "bak_category", "es_shop_goods_group_map", "sys_applet_set", "bak_goods", "pms_product_category", "bak_brand", "oms_order_setting", "ums_member", "ums_member_level", "building_user_community", "gen_config"); - public static final String sampleGoodsList = "id, brand_id, product_category_id, feight_template_id, product_attribute_category_id, name, pic, product_sn,\n" + +// public static final String sampleGoodsList = "id, brand_id, product_category_id, feight_template_id, product_attribute_category_id, name, pic, product_sn,\n" + +// " delete_status, publish_status, new_status, recommand_status, verify_status, sort, sale, price, promotion_price,\n" + +// " original_price, stock, low_stock, store_name,sub_title,store_id,unit,\n" + +// " weight, preview_status, service_ids,is_fenxiao, tags, brand_name,\n" + +// " product_category_name, supply_id, create_time,tags, school_id,area_id,is_vip"; + + public static final String sampleGoodsList = "id, brand_id, product_category_id, feight_template_id, product_attribute_category_id, name, pic, product_sn,\n" + " delete_status, publish_status, new_status, recommand_status, verify_status, sort, sale, price, promotion_price,\n" + " original_price, stock, low_stock, store_name,sub_title,store_id,unit,\n" + " weight, preview_status, service_ids,is_fenxiao, tags, brand_name,\n" +