Merge branch 'dev' into 'mp-server-test'

Dev

See merge request quanshu/mp-server!170

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

@@ -127,7 +127,7 @@ public class GoodsMgrController extends BaseApiController {
 	      return error(ErrorCodeEnum.ERROR_CODE_1001);
 	    }
 		Goods goods = goodsService.getById(goodsId);
-		if(null == goods || StringUtils.isBlank(goods.getGoodsId())) {
+		if(null == goods || null == goods.getGoodsId() || 0 == goods.getGoodsId()) {
 			 return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		GoodsVO goodsVo = new GoodsVO();
@@ -263,9 +263,9 @@ public class GoodsMgrController extends BaseApiController {
 	@ApiOperation(value = "停用、启用商品", notes = "停用、启用商品")
 	@PostMapping("/status")
 	public AjaxResult goodsStatus(@RequestBody Goods goods) {
-		String goodsId = (null != goods && StringUtils.isNotBlank(goods.getGoodsId()))?goods.getGoodsId():"";
+		Long goodsId = goods.getGoodsId();
 		GoodsStatusEnum status = (null != goods && null != goods.getStatus())?goods.getStatus():null;
-		if (StringUtils.isBlank(goodsId)
+		if (null == goodsId || 0 == goodsId
 				|| null == status) {
 			return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
@@ -292,7 +292,7 @@ public class GoodsMgrController extends BaseApiController {
 	      return error(ErrorCodeEnum.ERROR_CODE_1001);
 	    }
 		Goods goods = goodsService.getById(goodsId);
-		if(null == goods || StringUtils.isBlank(goods.getGoodsId())) {
+		if(null == goods || null == goods.getGoodsId() || 0 == goods.getGoodsId()) {
 			 return error(ErrorCodeEnum.ERROR_CODE_1001);
 		}
 		// 商品未下架， 不允许删除

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

@@ -85,7 +85,7 @@ public class UserExchangeController extends BaseApiController {
   @PostMapping("/goods/detail")
   @ApiOperation(value = "查看商品详情" , notes = "根据商品ID，获取商品信息")
   public AjaxResult getInfo(@RequestBody Goods param) {
-    if (StringUtils.isBlank(param.getGoodsId())) {
+    if (null == param.getGoodsId() || 0 == param.getGoodsId()) {
       return AjaxResult.error("参数异常，商品ID缺失");
     }
     Goods goods = goodsService.getById(param.getGoodsId());

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

@@ -27,8 +27,8 @@ public class Goods implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "goods_id", type = IdType.INPUT)
-  private String goodsId;
+  @TableId(value = "goods_id", type = IdType.AUTO)
+  private Long goodsId;
 
   /**
    * 商品标题

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

@@ -22,14 +22,14 @@ public class GoodsSku implements Serializable {
   /**
    * 主键
    */
-  @TableId(value = "sku_id", type = IdType.INPUT)
-  private String skuId;
+  @TableId(value = "sku_id", type = IdType.AUTO)
+  private Long skuId;
 
   /**
    * 商品ID
    */
   @TableField("goods_id")
-  private String goodsId;
+  private Long goodsId;
 
   /**
    * sku名称

mp-service/src/main/java/com/qs/mp/admin/service/impl/GoodsServiceImpl.java

@@ -30,17 +30,16 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 
 	@Autowired
 	private IGoodsService goodsService;
-	
+
 	@Autowired
 	private IGoodsSkuService goodsSkuService;
-	
+
     @Autowired
     private BizIdGenerator bizIdGenerator;
-	
+
 	@Override
 	@Transactional
 	public void saveGoods(Goods goods, List<GoodsSku> skuList) {
-		goods.setGoodsId(bizIdGenerator.newId());
 		boolean res = goodsService.save(goods);
 		if(!res) {
 			throw new ServiceException("请联系管理员");
@@ -49,7 +48,6 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 				&& skuList.size() > 0) {
 			for(GoodsSku goodsSku:skuList) {
 				if(null != goodsSku) {
-					goodsSku.setSkuId(bizIdGenerator.newIdWithUidSharding(goods.getGoodsId()));
 					goodsSku.setGoodsId(goods.getGoodsId());
 					if(null == goodsSku.getOriginPrice()) {
 						goodsSku.setOriginPrice(goodsSku.getExchangePrice());
@@ -75,7 +73,6 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 				&& skuList.size() > 0) {
 			for(GoodsSku goodsSku:skuList) {
 				if(null != goodsSku) {
-					goodsSku.setSkuId(bizIdGenerator.newIdWithUidSharding(goods.getGoodsId()));
 					goodsSku.setGoodsId(goods.getGoodsId());
 					if(null == goodsSku.getOriginPrice()) {
 						goodsSku.setOriginPrice(goodsSku.getExchangePrice());
@@ -94,9 +91,9 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
 			}else {
 				throw new ServiceException("请联系管理员");
 			}
-			
-			
-	
+
+
+
 		}
 	}
 }

mp-service/src/main/java/com/qs/mp/user/domain/UserDeliverOrderDetail.java → mp-service/src/main/java/com/qs/mp/common/domain/DeliveryCompany.java

@@ -1,4 +1,4 @@
-package com.qs.mp.user.domain;
+package com.qs.mp.common.domain;
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableField;
@@ -9,45 +9,39 @@ import java.util.Date;
 import lombok.Data;
 
 /**
- * @describe 提货订单发货详情实体类
+ * @describe 物流公司实体类
  * @auther quanshu
- * @create 2022-03-17 21:45:51
+ * @create 2022-03-17 22:02:15
  */
-@TableName("mp_user_deliver_order_detail")
+@TableName("mp_delivery_company")
 @Data
-public class UserDeliverOrderDetail implements Serializable {
+public class DeliveryCompany implements Serializable {
 
   private static final long serialVersionUID = 1L;
 
   /**
-   * 主键
+   * ID
    */
-  @TableId(value = "detail_id", type = IdType.INPUT)
-  private String detailId;
+  @TableId(value = "delivery_id", type = IdType.AUTO)
+  private Long deliveryId;
 
   /**
-   * 订单ID
+   * 物流公司名称
    */
-  @TableField("order_id")
-  private String orderId;
+  @TableField("company_name")
+  private String companyName;
 
   /**
-   * 用户ID
+   * 公司主页
    */
-  @TableField("user_id")
-  private Long userId;
+  @TableField("company_home_url")
+  private String companyHomeUrl;
 
   /**
-   * 物流ID
+   * 物流查询接口
    */
-  @TableField("delivery_id")
-  private String deliveryId;
-
-  /**
-   * 物流单号
-   */
-  @TableField("delivery_flow_id")
-  private String deliveryFlowId;
+  @TableField("query_url")
+  private String queryUrl;
 
   /**
    * 创建时间

mp-service/src/main/java/com/qs/mp/common/mapper/DeliveryCompanyMapper.java

@@ -0,0 +1,13 @@
+package com.qs.mp.common.mapper;
+
+import com.qs.mp.common.domain.DeliveryCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * @auther quanshu
+ * @create 2022-03-17 22:02:15
+ * @describe 物流公司mapper类
+ */
+public interface DeliveryCompanyMapper extends BaseMapper<DeliveryCompany> {
+
+}

mp-service/src/main/java/com/qs/mp/common/service/IDeliveryCompanyService.java

@@ -0,0 +1,16 @@
+package com.qs.mp.common.service;
+
+import com.qs.mp.common.domain.DeliveryCompany;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 物流公司 服务类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-17
+ */
+public interface IDeliveryCompanyService extends IService<DeliveryCompany> {
+
+}

mp-service/src/main/java/com/qs/mp/common/service/impl/DeliveryCompanyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.qs.mp.common.service.impl;
+
+import com.qs.mp.common.domain.DeliveryCompany;
+import com.qs.mp.common.mapper.DeliveryCompanyMapper;
+import com.qs.mp.common.service.IDeliveryCompanyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 物流公司 服务实现类
+ * </p>
+ *
+ * @author quanshu
+ * @since 2022-03-17
+ */
+@Service
+public class DeliveryCompanyServiceImpl extends ServiceImpl<DeliveryCompanyMapper, DeliveryCompany> implements IDeliveryCompanyService {
+
+}

mp-service/src/main/java/com/qs/mp/user/domain/UserDeliverOrderItem.java

@@ -41,13 +41,13 @@ public class UserDeliverOrderItem implements Serializable {
    * 商品ID
    */
   @TableField("goods_id")
-  private String goodsId;
+  private Long goodsId;
 
   /**
    * sku ID
    */
   @TableField("sku_id")
-  private String skuId;
+  private Long skuId;
 
   /**
    * sku 属性
@@ -74,10 +74,16 @@ public class UserDeliverOrderItem implements Serializable {
   private Integer goodsNum;
 
   /**
-   * 发货详情ID
+   * 物流公司ID
    */
-  @TableField("detail_id")
-  private String detailId;
+  @TableField("delivery_id")
+  private Long deliveryId;
+
+  /**
+   * 物流单号ID
+   */
+  @TableField("delivery_flow_id")
+  private String deliveryFlowId;
 
   /**
    * 创建时间

mp-service/src/main/java/com/qs/mp/user/domain/UserExchangeOrder.java

@@ -35,13 +35,13 @@ public class UserExchangeOrder implements Serializable {
    * 商品ID
    */
   @TableField("goods_id")
-  private String goodsId;
+  private Long goodsId;
 
   /**
    * sku ID
    */
   @TableField("sku_id")
-  private String skuId;
+  private Long skuId;
 
   /**
    * 消耗代币数

mp-service/src/main/java/com/qs/mp/user/domain/UserPrizeStorage.java

@@ -39,13 +39,13 @@ public class UserPrizeStorage implements Serializable {
    * 商品ID
    */
   @TableField("goods_id")
-  private String goodsId;
+  private Long goodsId;
 
   /**
    * sku ID
    */
   @TableField("sku_id")
-  private String skuId;
+  private Long skuId;
 
   /**
    * sku 属性

mp-service/src/main/java/com/qs/mp/user/mapper/UserDeliverOrderDetailMapper.java

@@ -1,13 +0,0 @@
-package com.qs.mp.user.mapper;
-
-import com.qs.mp.user.domain.UserDeliverOrderDetail;
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-
-/**
- * @auther quanshu
- * @create 2022-03-17 21:45:51
- * @describe 提货订单发货详情mapper类
- */
-public interface UserDeliverOrderDetailMapper extends BaseMapper<UserDeliverOrderDetail> {
-
-}

mp-service/src/main/java/com/qs/mp/user/service/IUserDeliverOrderDetailService.java

@@ -1,16 +0,0 @@
-package com.qs.mp.user.service;
-
-import com.qs.mp.user.domain.UserDeliverOrderDetail;
-import com.baomidou.mybatisplus.extension.service.IService;
-
-/**
- * <p>
- * 提货订单发货详情 服务类
- * </p>
- *
- * @author quanshu
- * @since 2022-03-17
- */
-public interface IUserDeliverOrderDetailService extends IService<UserDeliverOrderDetail> {
-
-}

mp-service/src/main/java/com/qs/mp/user/service/IUserExchangeOrderService.java

@@ -19,5 +19,5 @@ public interface IUserExchangeOrderService extends IService<UserExchangeOrder> {
    * @param skuId
    * @param orderNum
    */
-  void exchange(Long userId, String goodsId, String skuId, int orderNum);
+  void exchange(Long userId, Long goodsId, Long skuId, int orderNum);
 }

mp-service/src/main/java/com/qs/mp/user/service/impl/UserDeliverOrderDetailServiceImpl.java

@@ -1,20 +0,0 @@
-package com.qs.mp.user.service.impl;
-
-import com.qs.mp.user.domain.UserDeliverOrderDetail;
-import com.qs.mp.user.mapper.UserDeliverOrderDetailMapper;
-import com.qs.mp.user.service.IUserDeliverOrderDetailService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.stereotype.Service;
-
-/**
- * <p>
- * 提货订单发货详情 服务实现类
- * </p>
- *
- * @author quanshu
- * @since 2022-03-17
- */
-@Service
-public class UserDeliverOrderDetailServiceImpl extends ServiceImpl<UserDeliverOrderDetailMapper, UserDeliverOrderDetail> implements IUserDeliverOrderDetailService {
-
-}

mp-service/src/main/java/com/qs/mp/user/service/impl/UserExchangeOrderServiceImpl.java

@@ -6,6 +6,7 @@ import com.qs.mp.admin.domain.GoodsSku;
 import com.qs.mp.admin.service.IGoodsService;
 import com.qs.mp.admin.service.IGoodsSkuService;
 import com.qs.mp.common.enums.ErrorCodeEnum;
+import com.qs.mp.common.enums.GoodsStatusEnum;
 import com.qs.mp.common.enums.PrizeStorageInTypeEnum;
 import com.qs.mp.common.enums.PrizeStorageStatusEnum;
 import com.qs.mp.common.exception.ServiceException;
@@ -14,7 +15,6 @@ import com.qs.mp.system.service.id.BizIdGenerator;
 import com.qs.mp.user.domain.UserCoin;
 import com.qs.mp.user.domain.UserExchangeOrder;
 import com.qs.mp.user.domain.UserPrizeStorage;
-import com.qs.mp.user.domain.param.ExchangeOrderParam;
 import com.qs.mp.user.mapper.UserExchangeOrderMapper;
 import com.qs.mp.user.service.IUserCoinService;
 import com.qs.mp.user.service.IUserExchangeOrderService;
@@ -53,13 +53,13 @@ public class UserExchangeOrderServiceImpl extends ServiceImpl<UserExchangeOrderM
 
   @Override
   @Transactional
-  public void exchange(Long userId, String goodsId, String skuId, int orderNum) {
+  public void exchange(Long userId, Long goodsId, Long skuId, int orderNum) {
     int orderAmt = 0;
     Goods goods = goodsService.getById(goodsId);
     GoodsSku goodsSku = new GoodsSku();
     // 商品库存校验
     // 计算兑换盲豆数
-    if (StringUtils.isNotBlank(skuId)) {
+    if (null != skuId && 0 != skuId) {
       goodsSku = goodsSkuService.getById(skuId);
       if (goodsSku.getQuantity() < orderNum) {
         throw new ServiceException(ErrorCodeEnum.ERROR_CODE_1020);
@@ -105,7 +105,7 @@ public class UserExchangeOrderServiceImpl extends ServiceImpl<UserExchangeOrderM
     userPrizeStorageService.save(userPrizeStorage);
 
     // 修改商品库存
-    if (StringUtils.isNotBlank(skuId)) {
+    if (null != skuId && 0 != skuId) {
       boolean updateSku = goodsSkuService.update(new LambdaUpdateWrapper<GoodsSku>()
           .set(GoodsSku::getQuantity, goodsSku.getQuantity() - orderNum)
           .set(GoodsSku::getSoldQty, goodsSku.getSoldQty() + orderNum)
@@ -113,6 +113,7 @@ public class UserExchangeOrderServiceImpl extends ServiceImpl<UserExchangeOrderM
       Assert.isTrue(updateSku, "兑换商品更新SKU库存失败。goodsId:" + goodsId + ",skuId:" + skuId);
     }
     boolean updateGoods = goodsService.update(new LambdaUpdateWrapper<Goods>()
+            .set(goods.getQuantity() - orderNum == 0, Goods::getStatus, GoodsStatusEnum.PUT_OFF)
         .set(Goods::getQuantity, goods.getQuantity() - orderNum)
         .set(Goods::getExchangedQty, goods.getExchangedQty() + orderNum)
         .eq(Goods::getGoodsId, goodsId).eq(Goods::getQuantity, goods.getQuantity()).eq(Goods::getExchangedQty, goods.getExchangedQty()));

mp-service/src/main/java/com/qs/mp/user/service/impl/UserPrizeStorageServiceImpl.java

@@ -36,7 +36,7 @@ public class UserPrizeStorageServiceImpl extends ServiceImpl<UserPrizeStorageMap
       userPrizeStorage = new UserPrizeStorage();
       userPrizeStorage.setStorageId(bizIdGenerator.newIdWithUidSharding(String.valueOf(userId)));
       userPrizeStorage.setUserId(userId);
-      userPrizeStorage.setGoodsId(ticketAwardsPrize.getRefId());
+      userPrizeStorage.setGoodsId(Long.valueOf(ticketAwardsPrize.getRefId()));
       userPrizeStorage.setSkuId(null);
       userPrizeStorage.setProperties(null);
       userPrizeStorage.setTitle(ticketAwardsPrize.getTitle());

mp-service/src/main/resources/mapper/common/DeliveryCompanyMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.qs.mp.common.mapper.DeliveryCompanyMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.qs.mp.common.domain.DeliveryCompany">
+        <id column="delivery_id" property="deliveryId" />
+        <result column="company_name" property="companyName" />
+        <result column="company_home_url" property="companyHomeUrl" />
+        <result column="query_url" property="queryUrl" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_time" property="updatedTime" />
+    </resultMap>
+
+    <!-- 通用查询结果列 -->
+    <sql id="Base_Column_List">
+        delivery_id, company_name, company_home_url, query_url, created_time, updated_time
+    </sql>
+
+</mapper>

mp-service/src/main/resources/mapper/user/UserDeliverOrderDetailMapper.xml

@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.qs.mp.user.mapper.UserDeliverOrderDetailMapper">
-
-    <!-- 通用查询映射结果 -->
-    <resultMap id="BaseResultMap" type="com.qs.mp.user.domain.UserDeliverOrderDetail">
-        <id column="detail_id" property="detailId" />
-        <result column="order_id" property="orderId" />
-        <result column="user_id" property="userId" />
-        <result column="delivery_id" property="deliveryId" />
-        <result column="delivery_flow_id" property="deliveryFlowId" />
-        <result column="created_time" property="createdTime" />
-        <result column="updated_time" property="updatedTime" />
-    </resultMap>
-
-    <!-- 通用查询结果列 -->
-    <sql id="Base_Column_List">
-        detail_id, order_id, user_id, delivery_id, delivery_flow_id, created_time, updated_time
-    </sql>
-
-</mapper>

mp-service/src/main/resources/mapper/user/UserDeliverOrderItemMapper.xml

@@ -13,14 +13,15 @@
         <result column="title" property="title" />
         <result column="pic_url" property="picUrl" />
         <result column="goods_num" property="goodsNum" />
-        <result column="detail_id" property="detailId" />
+        <result column="delivery_id" property="deliveryId" />
+        <result column="delivery_flow_id" property="deliveryFlowId" />
         <result column="created_time" property="createdTime" />
         <result column="updated_time" property="updatedTime" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        item_id, order_id, storage_id, goods_id, sku_id, properties, title, pic_url, goods_num, detail_id, created_time, updated_time
+        item_id, order_id, storage_id, goods_id, sku_id, properties, title, pic_url, goods_num, delivery_id, delivery_flow_id, created_time, updated_time
     </sql>
 
 </mapper>