Skip to content

F
fileServe
Commit cc5cedab by XiaHou
Options

权星相关接口修复

parent 2bbcb6e2
Showing with 29 additions and 117 deletions
mall-admin/src/main/java/com/macro/mall/controller/PmsProductController.java
......@@ -67,8 +67,8 @@ public class PmsProductController {
@RequestMapping(value = "/getPageList", method = RequestMethod.POST)
public CommonResult<CommonPage<PmsProduct>> getPageList(@ApiParam("页数") @RequestParam("page")Integer page, @ApiParam("每页大小")@RequestParam("size")Integer size,
@ApiParam("模糊查询商品名称 ")@RequestParam("name") String name,
@ApiParam("审核状态 0待审核 1审核通过 2审核未通过 ")@RequestParam("auditStatus") Integer auditStatus){
return CommonResult.success(CommonPage.restPage(this.productService.getPageList(page,size,name,auditStatus)));
@ApiParam("审核状态 0待审核 1审核通过 2审核未通过 ")@RequestParam("auditStatus") Integer verifyStatus){
return CommonResult.success(CommonPage.restPage(this.productService.getPageList(page,size,name,verifyStatus)));
}
@ApiOperation("权星后台_根据商品id修改一条商品数据")
......
mall-mbg/src/main/java/com/macro/mall/model/PmsProduct.java
......@@ -169,9 +169,6 @@ public class PmsProduct implements Serializable {
@ApiModelProperty(value = "分销佣金")
private BigDecimal commission;
@ApiModelProperty(value = "审核状态 0待审核 1审核通过 2审核未通过")
private Integer auditStatus;
@ApiModelProperty(value = "商品描述")
private String description;
......@@ -596,14 +593,6 @@ public class PmsProduct implements Serializable {
this.commission = commission;
}
public Integer getAuditStatus() {
return auditStatus;
}
public void setAuditStatus(Integer auditStatus) {
this.auditStatus = auditStatus;
}
public String getDescription() {
return description;
}
......@@ -678,7 +667,6 @@ public class PmsProduct implements Serializable {
sb.append(", deliveryType=").append(deliveryType);
sb.append(", contSign=").append(contSign);
sb.append(", commission=").append(commission);
sb.append(", auditStatus=").append(auditStatus);
sb.append(", description=").append(description);
sb.append(", detailHtml=").append(detailHtml);
sb.append(", serialVersionUID=").append(serialVersionUID);
......
mall-mbg/src/main/java/com/macro/mall/model/PmsProductExample.java
......@@ -3375,66 +3375,6 @@ public class PmsProductExample {
addCriterion("commission not between", value1, value2, "commission");
return (Criteria) this;
}
public Criteria andAuditStatusIsNull() {
addCriterion("audit_status is null");
return (Criteria) this;
}
public Criteria andAuditStatusIsNotNull() {
addCriterion("audit_status is not null");
return (Criteria) this;
}
public Criteria andAuditStatusEqualTo(Integer value) {
addCriterion("audit_status =", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusNotEqualTo(Integer value) {
addCriterion("audit_status <>", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusGreaterThan(Integer value) {
addCriterion("audit_status >", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusGreaterThanOrEqualTo(Integer value) {
addCriterion("audit_status >=", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusLessThan(Integer value) {
addCriterion("audit_status <", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusLessThanOrEqualTo(Integer value) {
addCriterion("audit_status <=", value, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusIn(List<Integer> values) {
addCriterion("audit_status in", values, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusNotIn(List<Integer> values) {
addCriterion("audit_status not in", values, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusBetween(Integer value1, Integer value2) {
addCriterion("audit_status between", value1, value2, "auditStatus");
return (Criteria) this;
}
public Criteria andAuditStatusNotBetween(Integer value1, Integer value2) {
addCriterion("audit_status not between", value1, value2, "auditStatus");
return (Criteria) this;
}
}
public static class Criteria extends GeneratedCriteria {
......
mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductMapper.xml
......@@ -54,7 +54,6 @@
<result column="delivery_type" jdbcType="INTEGER" property="deliveryType" />
<result column="cont_sign" jdbcType="VARCHAR" property="contSign" />
<result column="commission" jdbcType="DECIMAL" property="commission" />
<result column="audit_status" jdbcType="INTEGER" property="auditStatus" />
</resultMap>
<resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.macro.mall.model.PmsProduct">
<result column="description" jdbcType="LONGVARCHAR" property="description" />
......@@ -126,7 +125,7 @@
delivery_area, is_time_up, timer_date, market_date, product_origin, cost_price, bar_code,
virtual_sales, product_pic, pic_type, product_video, note, promotion_type, gift_growth,
gift_point, use_point_limit, spu_id, third_flag, create_date, create_by, update_date,
update_by, del_flag, delete_status, delivery_type, cont_sign, commission, audit_status
update_by, del_flag, delete_status, delivery_type, cont_sign, commission
</sql>
<sql id="Blob_Column_List">
description, detail_html
......@@ -180,11 +179,14 @@
</if>
</delete>
<insert id="insert" parameterType="com.macro.mall.model.PmsProduct">
insert into pms_product (id, name, mcht_id,
publish_status, publish_date, verify_status,
new_status, brand_id, brand_name,
product_category_id, product_category_id_iii,
product_category_id_i, feight_template_id, product_attribute_category_id,
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into pms_product (name, mcht_id, publish_status,
publish_date, verify_status, new_status,
brand_id, brand_name, product_category_id,
product_category_id_iii, product_category_id_i,
feight_template_id, product_attribute_category_id,
product_sn, recommand_status, sort,
price, sub_title, low_stock,
unit, weight, keywords,
......@@ -197,13 +199,13 @@
spu_id, third_flag, create_date,
create_by, update_date, update_by,
del_flag, delete_status, delivery_type,
cont_sign, commission, audit_status,
description, detail_html)
values (#{id,jdbcType=BIGINT}, #{name,jdbcType=VARCHAR}, #{mchtId,jdbcType=BIGINT},
#{publishStatus,jdbcType=INTEGER}, #{publishDate,jdbcType=TIMESTAMP}, #{verifyStatus,jdbcType=INTEGER},
#{newStatus,jdbcType=INTEGER}, #{brandId,jdbcType=BIGINT}, #{brandName,jdbcType=VARCHAR},
#{productCategoryId,jdbcType=BIGINT}, #{productCategoryIdIii,jdbcType=BIGINT},
#{productCategoryIdI,jdbcType=BIGINT}, #{feightTemplateId,jdbcType=BIGINT}, #{productAttributeCategoryId,jdbcType=BIGINT},
cont_sign, commission, description,
detail_html)
values (#{name,jdbcType=VARCHAR}, #{mchtId,jdbcType=BIGINT}, #{publishStatus,jdbcType=INTEGER},
#{publishDate,jdbcType=TIMESTAMP}, #{verifyStatus,jdbcType=INTEGER}, #{newStatus,jdbcType=INTEGER},
#{brandId,jdbcType=BIGINT}, #{brandName,jdbcType=VARCHAR}, #{productCategoryId,jdbcType=BIGINT},
#{productCategoryIdIii,jdbcType=BIGINT}, #{productCategoryIdI,jdbcType=BIGINT},
#{feightTemplateId,jdbcType=BIGINT}, #{productAttributeCategoryId,jdbcType=BIGINT},
#{productSn,jdbcType=VARCHAR}, #{recommandStatus,jdbcType=INTEGER}, #{sort,jdbcType=INTEGER},
#{price,jdbcType=DECIMAL}, #{subTitle,jdbcType=VARCHAR}, #{lowStock,jdbcType=INTEGER},
#{unit,jdbcType=VARCHAR}, #{weight,jdbcType=DECIMAL}, #{keywords,jdbcType=VARCHAR},
......@@ -216,15 +218,15 @@
#{spuId,jdbcType=VARCHAR}, #{thirdFlag,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP},
#{createBy,jdbcType=BIGINT}, #{updateDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=BIGINT},
#{delFlag,jdbcType=INTEGER}, #{deleteStatus,jdbcType=INTEGER}, #{deliveryType,jdbcType=INTEGER},
#{contSign,jdbcType=VARCHAR}, #{commission,jdbcType=DECIMAL}, #{auditStatus,jdbcType=INTEGER},
#{description,jdbcType=LONGVARCHAR}, #{detailHtml,jdbcType=LONGVARCHAR})
#{contSign,jdbcType=VARCHAR}, #{commission,jdbcType=DECIMAL}, #{description,jdbcType=LONGVARCHAR},
#{detailHtml,jdbcType=LONGVARCHAR})
</insert>
<insert id="insertSelective" parameterType="com.macro.mall.model.PmsProduct">
<selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
SELECT LAST_INSERT_ID()
</selectKey>
insert into pms_product
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">
id,
</if>
<if test="name != null">
name,
</if>
......@@ -378,9 +380,6 @@
<if test="commission != null">
commission,
</if>
<if test="auditStatus != null">
audit_status,
</if>
<if test="description != null">
description,
</if>
......@@ -389,9 +388,6 @@
</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">
#{id,jdbcType=BIGINT},
</if>
<if test="name != null">
#{name,jdbcType=VARCHAR},
</if>
......@@ -545,9 +541,6 @@
<if test="commission != null">
#{commission,jdbcType=DECIMAL},
</if>
<if test="auditStatus != null">
#{auditStatus,jdbcType=INTEGER},
</if>
<if test="description != null">
#{description,jdbcType=LONGVARCHAR},
</if>
......@@ -721,9 +714,6 @@
<if test="record.commission != null">
commission = #{record.commission,jdbcType=DECIMAL},
</if>
<if test="record.auditStatus != null">
audit_status = #{record.auditStatus,jdbcType=INTEGER},
</if>
<if test="record.description != null">
description = #{record.description,jdbcType=LONGVARCHAR},
</if>
......@@ -789,7 +779,6 @@
delivery_type = #{record.deliveryType,jdbcType=INTEGER},
cont_sign = #{record.contSign,jdbcType=VARCHAR},
commission = #{record.commission,jdbcType=DECIMAL},
audit_status = #{record.auditStatus,jdbcType=INTEGER},
description = #{record.description,jdbcType=LONGVARCHAR},
detail_html = #{record.detailHtml,jdbcType=LONGVARCHAR}
<if test="_parameter != null">
......@@ -849,8 +838,7 @@
delete_status = #{record.deleteStatus,jdbcType=INTEGER},
delivery_type = #{record.deliveryType,jdbcType=INTEGER},
cont_sign = #{record.contSign,jdbcType=VARCHAR},
commission = #{record.commission,jdbcType=DECIMAL},
audit_status = #{record.auditStatus,jdbcType=INTEGER}
commission = #{record.commission,jdbcType=DECIMAL}
<if test="_parameter != null">
<include refid="Update_By_Example_Where_Clause" />
</if>
......@@ -1011,9 +999,6 @@
<if test="commission != null">
commission = #{commission,jdbcType=DECIMAL},
</if>
<if test="auditStatus != null">
audit_status = #{auditStatus,jdbcType=INTEGER},
</if>
<if test="description != null">
description = #{description,jdbcType=LONGVARCHAR},
</if>
......@@ -1076,7 +1061,6 @@
delivery_type = #{deliveryType,jdbcType=INTEGER},
cont_sign = #{contSign,jdbcType=VARCHAR},
commission = #{commission,jdbcType=DECIMAL},
audit_status = #{auditStatus,jdbcType=INTEGER},
description = #{description,jdbcType=LONGVARCHAR},
detail_html = #{detailHtml,jdbcType=LONGVARCHAR}
where id = #{id,jdbcType=BIGINT}
......@@ -1133,8 +1117,7 @@
delete_status = #{deleteStatus,jdbcType=INTEGER},
delivery_type = #{deliveryType,jdbcType=INTEGER},
cont_sign = #{contSign,jdbcType=VARCHAR},
commission = #{commission,jdbcType=DECIMAL},
audit_status = #{auditStatus,jdbcType=INTEGER}
commission = #{commission,jdbcType=DECIMAL}
where id = #{id,jdbcType=BIGINT}
</update>
</mapper>
\ No newline at end of file
mall-service/src/main/java/com/macro/mall/service/product/impl/PmsProductServiceImpl.java
......@@ -777,15 +777,15 @@ public class PmsProductServiceImpl implements PmsProductService {
* @return
*/
@Override
public List<PmsProduct> getPageList(Integer pageNum,Integer pageSize,String name,Integer auditStatus){
public List<PmsProduct> getPageList(Integer pageNum,Integer pageSize,String name,Integer verifyStatus){
PageHelper.startPage(pageNum, pageSize);
PmsProductExample example = new PmsProductExample();
PmsProductExample.Criteria criteria = example.createCriteria();
if(name != null && !"".equals(name)){
criteria.andNameLike("%"+"name"+"%");
}
if(auditStatus == null){
criteria.andAuditStatusEqualTo(auditStatus);
if(verifyStatus != null){
criteria.andVerifyStatusEqualTo(verifyStatus);
}
return this.pmsProductMapper.selectByExample(example);
}
......
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