商品ID类型修改

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/GoodsMgrController.java

@@ -4,51 +4,25 @@ import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.google.common.html.HtmlEscapers;
-import com.qs.mp.admin.domain.Coupon;
 import com.qs.mp.admin.domain.Goods;
-import com.qs.mp.admin.domain.GoodsCategory;
 import com.qs.mp.admin.domain.GoodsSku;
-import com.qs.mp.admin.domain.param.CouponParam;
 import com.qs.mp.admin.domain.param.GoodsParam;
 import com.qs.mp.admin.domain.param.GoodsQueryParam;
-import com.qs.mp.admin.domain.vo.GoodsListVO;
 import com.qs.mp.admin.domain.vo.GoodsVO;
-import com.qs.mp.admin.service.IGoodsCategoryService;
 import com.qs.mp.admin.service.IGoodsService;
 import com.qs.mp.admin.service.IGoodsSkuService;
-import com.qs.mp.channel.domain.Channel;
-import com.qs.mp.channel.domain.param.ChannelParam;
-import com.qs.mp.channel.domain.vo.ChannelOperDataVO;
-import com.qs.mp.channel.domain.vo.ChannelVO;
-import com.qs.mp.channel.service.IChannelService;
-import com.qs.mp.channel.service.IChannelUserRelService;
-import com.qs.mp.common.constant.UserConstants;
 import com.qs.mp.common.core.domain.AjaxResult;
 import com.qs.mp.common.core.page.TableDataInfo;
-import com.qs.mp.common.enums.ChannelRoleEnum;
-import com.qs.mp.common.enums.CouponStatusEnum;
 import com.qs.mp.common.enums.ErrorCodeEnum;
 import com.qs.mp.common.enums.GoodsStatusEnum;
-import com.qs.mp.common.utils.html.EscapeUtil;
-import com.qs.mp.system.domain.SysUser;
-import com.qs.mp.system.service.ISysUserService;
-import com.qs.mp.utils.SecurityUtils;
 import com.qs.mp.web.controller.common.BaseApiController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import ma.glasnost.orika.MapperFacade;
 
-import java.math.BigDecimal;
-import java.net.URI;
 import java.net.URLDecoder;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
-
-import org.apache.commons.codec.Decoder;
-import org.apache.commons.lang3.StringEscapeUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -76,11 +50,11 @@ public class GoodsMgrController extends BaseApiController {
 	@Autowired
 	private IGoodsSkuService goodsSkuService;
 
-	@Autowired
-	private IGoodsCategoryService goodsCategoryService;
-
-	@Autowired
-	private ISysUserService sysUserService;
+//	@Autowired
+//	private IGoodsCategoryService goodsCategoryService;
+	
+//	@Autowired
+//	private ISysUserService sysUserService;
 
 	@Autowired
 	private MapperFacade mapperFacade;
@@ -96,7 +70,7 @@ public class GoodsMgrController extends BaseApiController {
 		startPage();
 		QueryWrapper<Goods> queryWrapper = new QueryWrapper<Goods>();
 		queryWrapper.lambda().like(null != queryParam && StringUtils.isNotBlank(queryParam.getTitle()), Goods::getTitle, queryParam.getTitle());
-		queryWrapper.lambda().eq(null != queryParam && StringUtils.isNotBlank(queryParam.getGoodsId()), Goods::getGoodsId, queryParam.getGoodsId());
+		queryWrapper.lambda().eq(null != queryParam && null != queryParam.getGoodsId(), Goods::getGoodsId, queryParam.getGoodsId());
 		// 成本
 		queryWrapper.lambda().ge(null != queryParam && null != queryParam.getMinCost(), Goods::getCost, queryParam.getMinCost());
 		queryWrapper.lambda().le(null != queryParam && null != queryParam.getMaxCost(), Goods::getCost, queryParam.getMaxCost());
@@ -153,7 +127,7 @@ public class GoodsMgrController extends BaseApiController {
 	@ApiOperation(value = "新增商品信息", notes = "后台商品管理新增商品")
 	@PostMapping("/create")
 	public AjaxResult goodsCreate(@Validated @RequestBody GoodsParam goodsParam) {
-		if (StringUtils.isNotBlank(goodsParam.getGoodsId())) {
+		if (null != goodsParam.getGoodsId()) {
 			return AjaxResult.error("该商品已存在");
 		}
 		Goods goods = mapperFacade.map(goodsParam, Goods.class);
@@ -204,7 +178,7 @@ public class GoodsMgrController extends BaseApiController {
 	@ApiOperation(value = "编辑商品信息", notes = "后台商品管理修改商品信息")
 	@PostMapping("/update")
 	public AjaxResult goodsUpdate(@Validated @RequestBody GoodsParam goodsParam) {
-		if (null == goodsParam || StringUtils.isBlank(goodsParam.getGoodsId())) {
+		if (null == goodsParam || null == goodsParam.getGoodsId()) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		Goods oldGoods = goodsService.getById(goodsParam.getGoodsId());

mp-admin/src/main/java/com/qs/mp/web/controller/api/admin/UserDeliverOrderMgrController.java

@@ -199,7 +199,7 @@ public class UserDeliverOrderMgrController extends BaseApiController {
 									+ deliverOrder.getArea() + deliverOrder.getAddress();
 							deliverOrderExcel.setAddress(address);
 							deliverOrderExcel.setStatus(deliverOrder.getStatus().getDesc());
-							// deliverOrderExcel.setItemStatus(StringUtils.isNotBlank(userDeliverOrderItem.get));
+							deliverOrderExcel.setItemStatus(StringUtils.isNotBlank(userDeliverOrderItem.getDeliveryFlowId())?"已发货":"未发货");
 							excelList.add(deliverOrderExcel);
 						}
 					}

mp-service/src/main/java/com/qs/mp/admin/domain/param/GoodsParam.java

@@ -24,7 +24,7 @@ import lombok.Data;
 public class GoodsParam {
 
 	@ApiModelProperty(value = "商品ID", required = false)
-	private String goodsId;
+	private Long goodsId;
 
 	@NotNull(message = "商品名称不能为空")
 	@ApiModelProperty(value = "商品名称", required = true)

mp-service/src/main/java/com/qs/mp/admin/domain/param/GoodsQueryParam.java

@@ -21,7 +21,7 @@ import lombok.Data;
 public class GoodsQueryParam {
 
 	@ApiModelProperty(value = "商品ID", required = false)
-	private String goodsId;
+	private Long goodsId;
 
 	@NotNull(message = "商品名称不能为空")
 	@ApiModelProperty(value = "商品名称", required = true)

mp-service/src/main/java/com/qs/mp/admin/domain/vo/GoodsListVO.java

@@ -17,7 +17,7 @@ public class GoodsListVO {
   /**
    * 主键
    */
-  private String goodsId;
+  private Long goodsId;
 
   /**
    * 商品标题

mp-service/src/main/java/com/qs/mp/admin/domain/vo/GoodsVO.java

@@ -2,8 +2,6 @@ package com.qs.mp.admin.domain.vo;
 
 import com.alibaba.fastjson.annotation.JSONField;
 import com.alibaba.fastjson.serializer.SerializerFeature;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.qs.mp.admin.domain.GoodsSku;
 import com.qs.mp.common.enums.GoodsStatusEnum;
 
@@ -25,7 +23,7 @@ public class GoodsVO {
 	 */
 	private List<GoodsSku> skuList;
 
-	private String goodsId;
+	private Long goodsId;
 	/**
 	 * 商品标题
 	 */