Browse Source

客户、渠道、渠道网点、类目、SPU、SKU添加 是否可投放费用字段

mssql
Yen 3 years ago
parent
commit
37a297cfea
  1. 1
      src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java
  2. 3
      src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java
  3. 3
      src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java
  4. 3
      src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java
  5. 3
      src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPointBo.java
  6. 2
      src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java
  7. 2
      src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java
  8. 3
      src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java
  9. 3
      src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java
  10. 3
      src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java
  11. 3
      src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryTreeVo.java
  12. 3
      src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java
  13. 3
      src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuBo.java
  14. 1
      src/main/resources/mapper/bms/BmsChannelPointMapper.xml

1
src/main/java/com/qs/serve/modules/bms/controller/BmsChannelPointController.java

@ -42,7 +42,6 @@ import java.util.stream.Collectors;
public class BmsChannelPointController {
private BmsChannelPointService bmsChannelPointService;
private BmsChannelService bmsChannelService;
private BmsRegionService bmsRegionService;
private BmsRegion2Service bmsRegion2Service;
private TbsActivityChannelPointService activityChannelPointService;

3
src/main/java/com/qs/serve/modules/bms/entity/BmsChannel.java

@ -77,5 +77,8 @@ public class BmsChannel implements Serializable {
@TableField(fill = FieldFill.UPDATE)
private String updateBy;
/** 可投放费用标识 */
private Integer costFlag;
}

3
src/main/java/com/qs/serve/modules/bms/entity/BmsChannelPoint.java

@ -113,6 +113,9 @@ public class BmsChannelPoint implements Serializable {
@JsonProperty
private String delFlag;
/** 可投放费用标识 */
private Integer costFlag;
/** 创建人 */
@TableField(fill = FieldFill.INSERT)
private String createBy;

3
src/main/java/com/qs/serve/modules/bms/entity/BmsSupplier.java

@ -143,6 +143,9 @@ public class BmsSupplier implements Serializable {
@NotNull(message = "初始化欠费(历史记录)不能为空")
private BigDecimal initHisAmount;
/** 可投放费用标识 */
private Integer costFlag;
/** 当前用户ID */
@TableField(exist = false)
private String currUserId;

3
src/main/java/com/qs/serve/modules/bms/entity/bo/BmsChannelPointBo.java

@ -65,4 +65,7 @@ public class BmsChannelPointBo {
@Length(max = 255,message = "备注长度不能超过255字")
private String remark;
/** 可投放费用标识 */
private Integer costFlag;
}

2
src/main/java/com/qs/serve/modules/bms/entity/bo/BmsSupplierBo.java

@ -48,4 +48,6 @@ public class BmsSupplierBo {
/** 其它负责人 */
private String[] otherMgrIds;
/** 可投放费用标识 */
private Integer costFlag;
}

2
src/main/java/com/qs/serve/modules/goods/controller/GoodsCategoryController.java

@ -91,6 +91,7 @@ public class GoodsCategoryController {
GoodsCategoryTreeVo treeNode = CopierUtil.copy(cate,new GoodsCategoryTreeVo());
treeNode.setId(cate.getId()+"");
treeNode.setParentId(cate.getParentId().toString());
treeNode.setCostFlag(cate.getCostFlag());
treeNode.setSort(0);
treeNode.setEnable(cate.getEnable()+"");
if(loadSpuData && cate.getLevel().equals(3)){
@ -103,6 +104,7 @@ public class GoodsCategoryController {
spuNode.setEnable("1");
spuNode.setCode(goodsSpu.getSpuCode());
spuNode.setName(goodsSpu.getName());
spuNode.setCostFlag(goodsSpu.getCostFlag());
treeNode.addChildren(spuNode);
}
}

3
src/main/java/com/qs/serve/modules/goods/entity/GoodsCategory.java

@ -92,6 +92,9 @@ public class GoodsCategory implements Serializable {
@TableField(fill = FieldFill.UPDATE)
private String updateBy;
/** 可投放费用标识 */
private Integer costFlag;
@TableField(exist = false)
private Object parentInfo;

3
src/main/java/com/qs/serve/modules/goods/entity/GoodsSku.java

@ -115,6 +115,9 @@ public class GoodsSku implements Serializable {
@TableField(fill = FieldFill.UPDATE)
private String updateBy;
/** 可投放费用标识 */
private Integer costFlag;
@TableField(exist = false)
private List<Long> selectSkuIds;

3
src/main/java/com/qs/serve/modules/goods/entity/GoodsSpu.java

@ -100,6 +100,9 @@ public class GoodsSpu implements Serializable {
@JsonProperty
private String delFlag;
/** 可投放费用标识 */
private Integer costFlag;
/** 一级类目:品牌名称 */
@TableField(exist = false)
private String cateFirstLabel;

3
src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsCategoryTreeVo.java

@ -49,4 +49,7 @@ public class GoodsCategoryTreeVo extends TreeNode {
/** 等级 */
private Integer level;
/** 可投放费用标识 */
private Integer costFlag;
}

3
src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSkuBo.java

@ -69,5 +69,8 @@ public class GoodsSkuBo implements Serializable {
/** 规格值Ids(更新操作可为空) */
private List<Long> specValueIds;
/** 可投放费用标识 */
private Integer costFlag;
}

3
src/main/java/com/qs/serve/modules/goods/entity/bo/GoodsSpuBo.java

@ -60,4 +60,7 @@ public class GoodsSpuBo {
/** 产品口味(非sku规格值) */
private String tasteValue;
/** 可投放费用标识 */
private Integer costFlag;
}

1
src/main/resources/mapper/bms/BmsChannelPointMapper.xml

@ -86,6 +86,7 @@
<if test="query.delFlag != null and query.delFlag != ''"> and `bms_channel_point`.`del_flag` = #{query.delFlag}</if>
<if test="query.createBy != null and query.createBy != ''"> and `bms_channel_point`.`create_by` = #{query.createBy}</if>
<if test="query.updateBy != null and query.updateBy != ''"> and `bms_channel_point`.`update_by` = #{query.updateBy}</if>
<if test="query.costFlag != null and query.costFlag != ''"> and `bms_channel_point`.`cost_flag` = #{query.costFlag}</if>
</where>
</select>

Loading…
Cancel
Save