8.5 修正购物车内发布商品的ID指代的数据表

sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/MethodEnterpriseService.java

@@ -6,6 +6,7 @@ import com.pj.api.client.transport.TransportInterface;
 import com.pj.api.dto.AppUserDto;
 import com.pj.api.dto.TbLogisticsDto;
 import com.pj.common.core.exception.ServiceException;
+import com.pj.current.dto.APPLoginUserInfo;
 import com.pj.enummj.DeleteStatus;
 import com.pj.tb_enterprise.vo.OrdersVo;
 import com.pj.tb_goods.TbGoods;
@@ -56,9 +57,9 @@ public class MethodEnterpriseService {
      * @param tbOrderList
      * @return
      */
-    public List<OrdersVo> orderListChangeVo(List<TbOrder> tbOrderList){
+    public List<OrdersVo> orderListChangeVo(APPLoginUserInfo appLoginInfo,List<TbOrder> tbOrderList){
+        //判空
         if(tbOrderList.size() == 0)return new ArrayList<>();
-
         //创建返回值集合
         List<OrdersVo> result = new ArrayList<>();
         //循环遍历
@@ -69,13 +70,10 @@ public class MethodEnterpriseService {
             Integer orderStatus = null;
             Double price = null; Date orderTime = null;
             //开始处理
-            Long buyUserId = item.getBuyUserId();
-            AppUserDto appUserById = adminInterface.getAppUserById(buyUserId);
-            if(appUserById.getId() == null)throw new RuntimeException("该订单无买家信息");
             //orderId
             orderId = item.getId();
             //groupId,groupName
-            String fkId = appUserById.getFkId();
+            Long fkId = appLoginInfo.getFk();
             TbPeople tbPeople = tbPeopleMapper.selectById(fkId);
             if(tbPeople != null && tbPeople.getId() != null){
                 groupId = tbPeople.getGroupId();

sp-service/level-one-server/src/main/java/com/pj/tb_enterprise/TbEnterpriseService.java

@@ -193,13 +193,13 @@ public class TbEnterpriseService extends ServiceImpl<TbEnterpriseMapper, TbEnter
 		if(appLoginInfo == null || appLoginInfo.getLoginId() == null)throw new RuntimeException("当前登陆用户信息已失效!");
 		Long fk = appLoginInfo.getFk();
 		//仅能查询自己的订单
-		so.set("buyUserId",fk);
-		so.set("deleteStatus",DeleteStatus.DELETE_STATUS_ON.getCode());
-		so.set("keyword",keyword);
+		so.put("buyUserId",fk);
+		so.put("deleteStatus",DeleteStatus.DELETE_STATUS_ON.getCode());
+		so.put("keyword",keyword);
 
 		List<TbOrder> tbOrders = tbOrderMapper.getList(so);
 		//执行数据封装
-		List<OrdersVo> ordersVos = methodEnterpriseService.orderListChangeVo(tbOrders);
+		List<OrdersVo> ordersVos = methodEnterpriseService.orderListChangeVo(appLoginInfo,tbOrders);
 		return ordersVos;
 	}
 

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

@@ -48,7 +48,7 @@ public class MethodGoodsCartService {
             //店铺名称
             String shopName = tbShop.getName();
             //设置重量
-            Long goodsTransitId = item.getSaleGoodsInfoId();
+            Long goodsTransitId = item.getPublishGoodsId();
             TbGoodsTransit tbGoodsTransit = tbGoodsTransitMapper.selectById(goodsTransitId);
             if(tbGoodsTransit == null)throw new ServiceException("商品信息有误~");
             Double grossWeight = tbGoodsTransit.getGrossWeight(); //毛重

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

@@ -90,14 +90,14 @@ public class TbGoodsCartService extends ServiceImpl<TbGoodsCartMapper, TbGoodsCa
 		if(leader == 0)throw new ServiceException("您当前的身份不是互市组组长,无法添加购物车!");
 		//购物车查重
 		int size = tbGoodsCartMapper.selectList(new LambdaQueryWrapper<TbGoodsCart>()
-				.eq(TbGoodsCart::getBuyUserId, appUser.getLoginId()).eq(TbGoodsCart::getSaleGoodsInfoId,
-						goodsCartInfoDto.getSaleGoodsInfoId()).eq(TbGoodsCart::getDeleteStatus,
+				.eq(TbGoodsCart::getBuyUserId, appUser.getLoginId()).eq(TbGoodsCart::getPublishGoodsId,
+						goodsCartInfoDto.getPublishGoodsId()).eq(TbGoodsCart::getDeleteStatus,
 						DeleteStatus.DELETE_STATUS_ON.getCode())).size();
 		if(size != 0)
 			throw new ServiceException("当前商品已存在您的购物车中,请勿重复添加");
 		//获取商品对象
-		Long infoId = goodsCartInfoDto.getSaleGoodsInfoId();
-		TbGoodsTransit tbGoodsTransit = tbGoodsTransitMapper.selectById(infoId);
+		Long publishGoodsId = goodsCartInfoDto.getPublishGoodsId();
+		TbGoodsTransit tbGoodsTransit = tbGoodsTransitMapper.selectById(publishGoodsId);
 		if(tbGoodsTransit == null)return AjaxJson.getError("当前商品信息存在异常");
 		//创建保存对象
 		TbGoodsCart tbGoodsCart = new TbGoodsCart();
@@ -111,7 +111,7 @@ public class TbGoodsCartService extends ServiceImpl<TbGoodsCartMapper, TbGoodsCa
 		//当前商品的单位
 		tbGoodsCart.setGoodsUnit(tbGoodsTransit.getGoodsUnits());
 		//goodsTransitId
-		tbGoodsCart.setPublishGoodsId(infoId);
+		tbGoodsCart.setPublishGoodsId(publishGoodsId);
 		//tbGoodsId
 		tbGoodsCart.setSaleGoodsInfoId(tbGoodsTransit.getGoodsId());
 		//商品价格

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

@@ -32,7 +32,7 @@ public class GoodsCartInfoDto {
     private Long tradeAreaId;
     /** goodsTransit商品ID */
     @NotNull(message = "商品ID必填")
-    private Long saleGoodsInfoId;
+    private Long publishGoodsId;
     /** 商品图片 */
     @NotNull(message = "商品ID必填")
     private String goodsImg;

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

@@ -68,7 +68,7 @@ public class GoodsCartVo {
     private Double totalPrice;
 
     /**
-     * 售卖商品详情表ID
+     * tb_goods表ID
      */
     private Long saleGoodsInfoId;
 
@@ -93,7 +93,7 @@ public class GoodsCartVo {
     private Integer distribution;
 
     /**
-     *
+     * tb_goods_transit表ID
      */
     private Long publishGoodsId;
 

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

@@ -190,7 +190,7 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		tbGoodsTransit.setShopName(transactionGoodsParam.getShopName());
 
 		//商户编号
-		tbGoodsTransit.setMerchantId(appLoginInfo.getLoginId() + "");
+		tbGoodsTransit.setMerchantId(appLoginInfo.getFk() + "");
 		//商户名称
 		tbGoodsTransit.setMerchantName(appLoginInfo.getLoginName());
 
@@ -208,8 +208,7 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		tbGoodsTransit.setDeleteStatus(1);
 		//执行保存
 		int insert = tbGoodsTransitMapper.insert(tbGoodsTransit);
-		if(insert == 1)return true;
-		return false;
+		return insert == 1;
 	}
 
 	/** app端 - 商户自行选择上架/下架商品 */
@@ -232,8 +231,7 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		tbGoodsTransit.setUpdateName(appLoginInfo.getLoginName());
 		//执行保存
 		int updateById = tbGoodsTransitMapper.updateById(tbGoodsTransit);
-		if(updateById == 1)return true;
-		return false;
+		return updateById == 1;
 	}
 
 	/**
@@ -263,8 +261,8 @@ public class TbGoodsTransitService extends ServiceImpl<TbGoodsTransitMapper, TbG
 		if(tbGoodsTransit == null || tbGoodsTransit.getId() == null)
 			throw new RuntimeException("当前商品信息已失效!");
 		//检查是否属于海关允许销售商品
-		String declareOdd = tbGoodsTransit.getDeclareOdd();
-		TbGoods tbGoods = tbGoodsMapper.selectById(declareOdd);
+		Long goodsId = tbGoodsTransit.getGoodsId();
+		TbGoods tbGoods = tbGoodsMapper.selectById(goodsId);
 		if(tbGoods == null)throw new RuntimeException("当前商品海关已不允许销售!");
 		//执行采购,创建一级市场订单表 , 该方法只是设置tbOrder的属性
 		TbOrder tbOrder = methodGoodsTransitService.setTbOrderProperties(tbGoodsTransit, appLoginInfo);