8.4 完善购物车

sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/MethodGoodsCartService.java

@@ -0,0 +1,75 @@
+package com.pj.tb_goods_cart;
+
+import com.pj.common.core.exception.ServiceException;
+import com.pj.tb_goods_cart.vo.GoodsCartVo;
+import com.pj.tb_goods_transit.TbGoodsTransit;
+import com.pj.tb_goods_transit.TbGoodsTransitMapper;
+import com.pj.tb_shop.TbShop;
+import com.pj.tb_shop.TbShopMapper;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 08 04 16 30
+ **/
+@Service
+@Transactional(rollbackFor = Exception.class)
+public class MethodGoodsCartService {
+
+    @Autowired
+    private TbGoodsCartMapper tbGoodsCartMapper;
+    @Autowired
+    private TbShopMapper tbShopMapper;
+    @Autowired
+    private TbGoodsTransitMapper tbGoodsTransitMapper;
+
+
+    /**
+     * 购物车转成VO
+     * @param cartList
+     * @return
+     */
+    public List<GoodsCartVo> changeTbGoodsCartToGoodsCartVoList(List<TbGoodsCart> cartList){
+        //校验大小
+        if(cartList.size() == 0)return null;
+        //创建返回值集合
+        List<GoodsCartVo> resultList = new ArrayList<>();
+        //遍历封装
+        cartList.forEach(item -> {
+            //获取店铺
+            TbShop tbShop = tbShopMapper.selectById(item.getShopId());
+            if(tbShop == null)throw new ServiceException("店铺信息有误~");
+            //店铺名称
+            String shopName = tbShop.getName();
+            //设置重量
+            Long goodsTransitId = item.getSaleGoodsInfoId();
+            TbGoodsTransit tbGoodsTransit = tbGoodsTransitMapper.selectById(goodsTransitId);
+            if(tbGoodsTransit == null)throw new ServiceException("商品信息有误~");
+            Double grossWeight = tbGoodsTransit.getGrossWeight(); //毛重
+            Double netWeight = tbGoodsTransit.getNetWeight(); //净重
+            String goodsUnits = tbGoodsTransit.getGoodsUnits();
+            //创建对象
+            GoodsCartVo goodsCartVo = new GoodsCartVo();
+            //数据拷贝
+            BeanUtils.copyProperties(item,goodsCartVo);
+            //设置店铺名称
+            goodsCartVo.setShopName(shopName);
+            //设置净重
+            goodsCartVo.setNetWeight(netWeight + goodsUnits);
+            //设置毛重
+            goodsCartVo.setGrossWeight(grossWeight + goodsUnits);
+            //装进集合
+            resultList.add(goodsCartVo);
+        });
+
+        return resultList;
+    }
+
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/TbGoodsCart.java

@@ -80,7 +80,7 @@ public class TbGoodsCart extends Model<TbGoodsCart> implements Serializable {
 	private Double totalPrice;	
 
 	/**
-	 * 售卖商品详情表ID 
+	 * tb_goods表主键
 	 */
 	private Long saleGoodsInfoId;	
 
@@ -105,7 +105,7 @@ public class TbGoodsCart extends Model<TbGoodsCart> implements Serializable {
 	private Integer distribution;	
 
 	/**
-	 *  
+	 *  tb_goods_transit主键
 	 */
 	private Long publishGoodsId;
 

sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/TbGoodsCartController.java

@@ -2,6 +2,7 @@ package com.pj.tb_goods_cart;
 
 import java.util.List;
 
+import com.pj.tb_goods_cart.vo.GoodsCartVo;
 import com.pj.utils.so.SoMap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -26,7 +27,7 @@ public class TbGoodsCartController {
 
 	/** 增 */  
 	@RequestMapping("add")
-	@SaCheckPermission(TbGoodsCart.PERMISSION_CODE_ADD)
+//	@SaCheckPermission(TbGoodsCart.PERMISSION_CODE_ADD)
 	public AjaxJson add(TbGoodsCart t){
 		tbGoodsCartService.add(t);
 		t = tbGoodsCartService.getById(SP.publicMapper.getPrimarykey());
@@ -35,7 +36,7 @@ public class TbGoodsCartController {
 
 	/** 删 */  
 	@RequestMapping("delete")
-	@SaCheckPermission(TbGoodsCart.PERMISSION_CODE_DEL)
+//	@SaCheckPermission(TbGoodsCart.PERMISSION_CODE_DEL)
 	public AjaxJson delete(Long id){
 		 tbGoodsCartService.delete(id);
 		return AjaxJson.getSuccess();
@@ -43,7 +44,7 @@ public class TbGoodsCartController {
 	
 	/** 删 - 根据id列表 */  
 	@RequestMapping("deleteByIds")
-	@SaCheckPermission(TbGoodsCart.PERMISSION_CODE_DEL)
+//	@SaCheckPermission(TbGoodsCart.PERMISSION_CODE_DEL)
 	public AjaxJson deleteByIds(){
 		List<Long> ids = SoMap.getRequestSoMap().getListByComma("ids", long.class); 
 		int line = SP.publicMapper.deleteByIds(TbGoodsCart.TABLE_NAME, ids);
@@ -52,7 +53,7 @@ public class TbGoodsCartController {
 	
 	/** 改 */  
 	@RequestMapping("update")
-	@SaCheckPermission(TbGoodsCart.PERMISSION_CODE_EDIT)
+//	@SaCheckPermission(TbGoodsCart.PERMISSION_CODE_EDIT)
 	public AjaxJson update(TbGoodsCart t){
 		tbGoodsCartService.update(t);
 		return AjaxJson.getSuccess();
@@ -60,7 +61,7 @@ public class TbGoodsCartController {
 
 	/** 查 - 根据id */  
 	@RequestMapping("getById")
-		@SaCheckPermission(TbGoodsCart.PERMISSION_CODE)
+//		@SaCheckPermission(TbGoodsCart.PERMISSION_CODE)
 	public AjaxJson getById(String id){
 		TbGoodsCart t = tbGoodsCartService.getById(id);
 		return AjaxJson.getSuccessData(t);
@@ -68,10 +69,10 @@ public class TbGoodsCartController {
 
 	/** 查集合 - 根据条件（参数为空时代表忽略指定条件） */  
 	@RequestMapping("getList")
-		@SaCheckPermission(TbGoodsCart.PERMISSION_CODE)
+//		@SaCheckPermission(TbGoodsCart.PERMISSION_CODE)
 	public AjaxJson getList() { 
 		SoMap so = SoMap.getRequestSoMap();
-		List<TbGoodsCart> list = tbGoodsCartService.getList(so.startPage());
+		List<GoodsCartVo> list = tbGoodsCartService.getList(so.startPage());
 		return AjaxJson.getPageData(so.getDataCount(), list);
 	}
 	
@@ -79,7 +80,7 @@ public class TbGoodsCartController {
 	
 	/** 改 - 删除状态(0=禁用,1=启用) */  
 	@RequestMapping("updateDeleteStatus")
-	@SaCheckPermission(TbGoodsCart.PERMISSION_CODE_EDIT)
+//	@SaCheckPermission(TbGoodsCart.PERMISSION_CODE_EDIT)
 	public AjaxJson updateDeleteStatus(String id, Integer value){
 		int line = SP.publicMapper.updateColumnById(TbGoodsCart.TABLE_NAME, "delete_status", value, id);
 		return AjaxJson.getByLine(line);

sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/dto/GoodsCartInfoDto.java

@@ -30,19 +30,9 @@ public class GoodsCartInfoDto {
     /** 购买地点ID */
     @NotNull(message = "区域ID必填")
     private Long tradeAreaId;
-//    /** 购买总价 */
-//    @NotNull(message = "必填")
-//    @DecimalMin("0.0")
-//    private Double totalPrice;
-    /** 商品ID */
+    /** goodsTransit商品ID */
     @NotNull(message = "商品ID必填")
     private Long saleGoodsInfoId;
-//    /** 购买者类型(边民/...) */
-//    @NotNull(message = "购买者ID必填")
-//    private Integer buyUserType;
-//    /** 购买方式 */
-//    @NotNull(message = "购买类型(2=互助组,3=个人购买)必填")
-//    private Integer buyType;
     /** 商品图片 */
     @NotNull(message = "商品ID必填")
     private String goodsImg;

sp-service/level-one-server/src/main/java/com/pj/tb_goods_cart/vo/GoodsCartVo.java

@@ -0,0 +1,143 @@
+package com.pj.tb_goods_cart.vo;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotNull;
+import java.util.Date;
+
+/**
+ * @Author Mechrevo
+ * @Date 2023 08 04 16 27
+ **/
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class GoodsCartVo {
+
+    /**
+     * 店铺名
+     */
+    private String shopName;
+
+    /**
+     * 重量
+     */
+    private String netWeight;
+    /**
+     * 毛量
+     */
+    private String grossWeight;
+
+    @NotNull(message = "id")
+    private String id;
+
+    /**
+     * 商家ID
+     */
+    @NotNull(message = "enterpriseId")
+    private Long enterpriseId;
+
+    /**
+     *
+     */
+    @NotNull(message = "shopId")
+    private Long shopId;
+
+    /**
+     *
+     */
+    private Long tradeAreaId;
+
+    private String goodsImg;
+
+    private String goodsName;
+
+    private Integer buyNum;
+
+    /**
+     *
+     */
+    private Long buyUserId;
+
+    /**
+     * 购买金额
+     */
+    private Double totalPrice;
+
+    /**
+     * 售卖商品详情表ID
+     */
+    private Long saleGoodsInfoId;
+
+    /**
+     * 商品重量
+     */
+    private Double buyWeight;
+
+    /**
+     *
+     */
+    private String buyUserType;
+
+    /**
+     * 购买方式(2=互助组,3=个人购买)
+     */
+    private Integer buyType;
+
+    /**
+     * 分配方式
+     */
+    private Integer distribution;
+
+    /**
+     *
+     */
+    private Long publishGoodsId;
+
+    /**
+     * 商品重量单位
+     */
+    private String goodsUnit;
+
+    /**
+     * 创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date createTime;
+
+    /**
+     * 创建人编号
+     */
+    private String createBy;
+
+    /**
+     * 创建人名称
+     */
+    private String createName;
+
+    /**
+     * 更新时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date updateTime;
+
+    /**
+     * 更新人编号
+     */
+    private String updateBy;
+
+    /**
+     * 更新人名称
+     */
+    private String updateName;
+
+    /**
+     * 删除状态(0=禁用,1=启用)
+     */
+    private Integer deleteStatus;
+
+
+}

sp-service/level-one-server/src/main/java/com/pj/tb_goods_transit/TbGoodsTransit.java

@@ -71,6 +71,11 @@ public class TbGoodsTransit extends Model<TbGoodsTransit> implements Serializabl
 	private String goodsImg;
 
 	/**
+	 * 海关商品表主键
+	 */
+	private Long goodsId;
+
+	/**
 	 * 商品名称 
 	 */
 	private String goodsName;