2025年1月22日17:17:49

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjOrder.java

@@ -654,6 +654,11 @@ public class PjOrder implements Serializable {
 	@TableField(exist = false)
 	private List<String> businesDateList;
 	/**
+	 * 出库日期
+	 */
+	@TableField(exist = false)
+	private List<String> deliveryBusinesDateList;
+	/**
 	 * 应结日期
 	 */
 	@TableField(exist = false)

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/shopping/entity/ShoppingMallDetail.java

@@ -86,5 +86,11 @@ public class ShoppingMallDetail implements Serializable {
 	@TableField(exist = false)
 	private BigDecimal goodsNum;
 
+	/**
+	 * 商品名称
+	 */
+	@TableField(exist = false)
+	private String cname;
+
 
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/controller/CorpsStatisticsController.java

@@ -69,7 +69,6 @@ public class CorpsStatisticsController {
 			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());
 			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 			if (ObjectUtils.isNotNull(corpsDescDto1.getCreditLimit()) && ObjectUtils.isNotNull(corpsDescDto1.getUseCreditLimit())) {
 				corpsDescDto1.setCreditLimitBalance(corpsDescDto1.getCreditLimit().subtract(corpsDescDto1.getUseCreditLimit()));
@@ -126,7 +125,6 @@ public class CorpsStatisticsController {
 			lambdaQueryWrapper.eq(PjOrder::getSalesCompanyId, AuthUtil.getDeptId());
 			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 			List<PjOrder> orderList = orderService.list(lambdaQueryWrapper);
 			if (ObjectUtils.isNotNull(orderList)) {
@@ -171,7 +169,6 @@ public class CorpsStatisticsController {
 			}
 			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 			List<PjOrder> orderList = orderService.list(lambdaQueryWrapper);
 			if (ObjectUtils.isNotNull(orderList)) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderController.java

@@ -113,7 +113,8 @@ public class OrderController extends BladeController {
 				PjOrder::getInterest, PjOrder::getFundingAmount, PjOrder::getBondAmount, PjOrder::getProportion,
 				PjOrder::getGoodsTotalShipAmount, PjOrder::getOutGoodsTotalShipNum, PjOrder::getOutGoodsTotalShipAmount,
 				PjOrder::getGoodsTotalShipNum, PjOrder::getSalesAmount, PjOrder::getRefno, PjOrder::getPrimaryGoodsTotalNum,
-				PjOrder::getPrimaryFundingAmount, PjOrder::getUseAdvanceChargeAmount, PjOrder::getProduceAdvanceChargeAmount)
+				PjOrder::getPrimaryFundingAmount, PjOrder::getUseAdvanceChargeAmount, PjOrder::getProduceAdvanceChargeAmount,
+				PjOrder::getDeliveryBusinesDate)
 			.eq(PjOrder::getTenantId, AuthUtil.getTenantId())
 			.eq(PjOrder::getIsDeleted, 0)
 			.eq(PjOrder::getBsType, order.getBsType())
@@ -138,6 +139,10 @@ public class OrderController extends BladeController {
 			lambdaQueryWrapper.ge(PjOrder::getBusinesDate, order.getBusinesDateList().get(0));
 			lambdaQueryWrapper.le(PjOrder::getBusinesDate, order.getBusinesDateList().get(1));
 		}
+		if (order.getDeliveryBusinesDateList() != null && order.getDeliveryBusinesDateList().size() > 1) {//出库日期
+			lambdaQueryWrapper.ge(PjOrder::getDeliveryBusinesDate, order.getDeliveryBusinesDateList().get(0));
+			lambdaQueryWrapper.le(PjOrder::getDeliveryBusinesDate, order.getDeliveryBusinesDateList().get(1));
+		}
 		if (order.getPaymentDateList() != null && order.getPaymentDateList().size() > 1) {//支付时间
 			lambdaQueryWrapper.ge(PjOrder::getPaymentDate, order.getPaymentDateList().get(0));
 			lambdaQueryWrapper.le(PjOrder::getPaymentDate, order.getPaymentDateList().get(1));
@@ -169,7 +174,6 @@ public class OrderController extends BladeController {
 			}
 			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
 				" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				" OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))");
 		}
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
@@ -310,7 +314,6 @@ public class OrderController extends BladeController {
 			}
 			lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
 				" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				" OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))");
 		}
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
@@ -871,7 +874,6 @@ public class OrderController extends BladeController {
 		}
 		lambdaQueryWrapperXS.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
 			" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-			" OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 			" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))");
 		List<PjOrder> pjOrderListXS = orderService.list(lambdaQueryWrapperXS);
 		List<PjOrder> pjOrderListCG = orderService.list(new LambdaQueryWrapper<PjOrder>().eq(PjOrder::getIsDeleted, 0)

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/OrderStatisticsController.java

@@ -94,7 +94,6 @@ public class OrderStatisticsController extends BladeController {
 		}
 		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
 			"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-			"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 			"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))");
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
 		IPage<PjOrder> pages = orderService.page(Condition.getPage(query), lambdaQueryWrapper);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/controller/ReturnsController.java

@@ -117,7 +117,6 @@ public class ReturnsController {
 		}
 		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
 			" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-			" OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 			" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))");
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {
@@ -220,7 +219,6 @@ public class ReturnsController {
 		}
 		lambdaQueryWrapper.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
 			" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-			" OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 			" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))");
 		lambdaQueryWrapper.orderByDesc(PjOrder::getCreateTime);
 		if (!AuthUtil.getUserRole().contains("admin") && !AuthUtil.getUserRole().contains("老板")) {

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/mapper/OrderMapper.xml

@@ -235,7 +235,6 @@
           AND po.is_deleted = 0
           and (( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) )
                    OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))
-                   OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))
         OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
         <if test="order.businesDateList != null and order.businesDateList[0] != null and order.businesDateList[0]!= ''">
             and po.busines_date &gt;= #{order.businesDateList[0]}
@@ -538,7 +537,6 @@
           AND po.bs_type = 'XS'
           AND (( po.business_source = '外部销售' AND FIND_IN_SET( po.actual_payment_status, '2,3' ) )
                    OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3,4' ))
-                   OR (po.business_source = '共享销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3,4' ))
             OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
           AND po.status = '已发货'
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &gt;= DATE_FORMAT(#{statusDate},'%Y-%m')
@@ -566,7 +564,6 @@
           AND po.bs_type = 'XS'
           AND (( po.business_source = '外部销售' AND FIND_IN_SET( po.actual_payment_status, '2,3' ) )
             OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3,4' ))
-            OR (po.business_source = '共享销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3,4' ))
             OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
           AND po.status = '已发货'
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &gt;= DATE_FORMAT(#{statusDate},'%Y-%m')
@@ -595,7 +592,6 @@
           AND po.bs_type = 'XS'
           AND (( po.business_source = '外部销售' AND FIND_IN_SET( po.actual_payment_status, '2,3' ) )
             OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3,4' ))
-            OR (po.business_source = '共享销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3,4' ))
             OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
           AND po.status = '已发货'
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &gt;= DATE_FORMAT(#{statusDate},'%Y-%m')
@@ -623,7 +619,6 @@
           AND po.bs_type = 'XS'
           AND (( po.business_source = '外部销售' AND FIND_IN_SET( po.actual_payment_status, '2,3' ) )
             OR (po.business_source = '内部销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3,4' ))
-            OR (po.business_source = '共享销售' AND FIND_IN_SET( po.actual_payment_status, '0,1,2,3,4' ))
         OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
           AND po.status = '已发货'
           AND DATE_FORMAT(po.busines_date,'%Y-%m') &gt;= DATE_FORMAT(#{statusDate},'%Y-%m')
@@ -648,7 +643,6 @@
         </if>
             AND (( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) )
                 OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))
-                OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))
                 OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))
             AND busines_date >= date_sub(CURDATE(), INTERVAL 6 MONTH)
     </select>

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/order/service/impl/OrderServiceImpl.java

@@ -707,7 +707,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			.eq(PjOrder::getBusinesDate, dateS)
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))"));
 		if (!orderList.isEmpty()) {
 			return R.data(orderList.stream().map(PjOrder::getTotalMoney).filter(Objects::nonNull).reduce(BigDecimal.ZERO, BigDecimal::add));
@@ -4168,7 +4167,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 		sharePjOrder.setSrcNo(srcOrdNo);
 		sharePjOrder.setSalesCompanyId(dept.getId());
 		sharePjOrder.setSalesCompanyName(dept.getDeptName());
-		sharePjOrder.setBusinessSource("共享销售");
+		sharePjOrder.setBusinessSource("内部销售");
 		sharePjOrder.setStatus("待确认");
 		String goodsNo = orderItemsList.stream().map(PjOrderItems::getGoodsNo).distinct().collect(Collectors.joining(","));
 		List<PjGoodsDesc> goodsDescList = goodsDescMapper.selectListGoods(goodsNo, dept.getTenantId());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/mapper/ProductLaunchMapper.xml

@@ -93,7 +93,6 @@
           AND ps.tenant_id = #{order.tenantId}
         and (( ps.business_source = '外部销售' AND FIND_IN_SET( ps.status, '待确认,待发货,已发货,已收货' ) )
         OR (ps.business_source = '内部销售' AND FIND_IN_SET( ps.status, '待发货,已发货,已收货' ))
-        OR (ps.business_source = '共享销售' AND FIND_IN_SET( ps.status, '待发货,已发货,已收货' ))
         OR (ps.business_source = '额度支付' AND FIND_IN_SET( ps.status, '待确认,待发货,已发货,已收货' )))
         <if test="order.goodsId!=null">
             and psi.goods_id = #{order.goodsId}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/service/impl/ProductLaunchServiceImpl.java

@@ -725,14 +725,8 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 		shoppingCart.setInventory(productLaunch.getInventory());
 		shoppingCart.setTenantId(AuthUtil.getTenantId());
 		shoppingCart.setWhetherIntegral(productLaunch.getWhetherIntegral());
-		if (productLaunch.getBillType() == 0) {
-			shoppingCart.setSharedCompanyId(productLaunch.getSalesCompanyId());
-			shoppingCart.setSharedCompanyName(productLaunch.getSalesCompanyName());
-		} else {
-			shoppingCart.setSharedCompanyId(productLaunch.getSourceCompanyId());
-			shoppingCart.setSharedCompanyName(iSysClient.getDept(productLaunch.getSourceCompanyId()).getData().getFullName());
-		}
-
+		shoppingCart.setSharedCompanyId(productLaunch.getSalesCompanyId());
+		shoppingCart.setSharedCompanyName(productLaunch.getSalesCompanyName());
 		LambdaQueryWrapper<PjShoppingCart> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(PjShoppingCart::getTenantId, AuthUtil.getTenantId())
 			.eq(PjShoppingCart::getIsDeleted, 0)
@@ -1310,8 +1304,8 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 	}
 
 	@Override
-	public List<PjProductLaunch> selectListProductLaunch(String goodsNo, String salesCompanyName,String tenantId) {
-		return baseMapper.selectListProductLaunch(goodsNo,salesCompanyName,tenantId);
+	public List<PjProductLaunch> selectListProductLaunch(String goodsNo, String salesCompanyName, String tenantId) {
+		return baseMapper.selectListProductLaunch(goodsNo, salesCompanyName, tenantId);
 	}
 
 	@Override

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/share/controller/SharePutOnShelvesController.java

@@ -97,6 +97,8 @@ public class SharePutOnShelvesController extends BladeController {
 			.like(ObjectUtils.isNotNull(sharePutOnShelves.getPlaceProduction()), SharePutOnShelves::getPlaceProduction, sharePutOnShelves.getPlaceProduction())
 			.like(ObjectUtils.isNotNull(sharePutOnShelves.getBrandName()), SharePutOnShelves::getBrandName, sharePutOnShelves.getBrandName())
 			.like(ObjectUtils.isNotNull(sharePutOnShelves.getBrandId()), SharePutOnShelves::getBrandId, sharePutOnShelves.getBrandId())
+			.like(ObjectUtils.isNotNull(sharePutOnShelves.getSrcSalesCompanyName()), SharePutOnShelves::getSrcSalesCompanyName, sharePutOnShelves.getSrcSalesCompanyName())
+			.like(ObjectUtils.isNotNull(sharePutOnShelves.getSharedCompany()), SharePutOnShelves::getSharedCompany, sharePutOnShelves.getSharedCompany())
 			.eq(ObjectUtils.isNotNull(sharePutOnShelves.getBillType()), SharePutOnShelves::getBillType, sharePutOnShelves.getBillType())
 			.eq(ObjectUtils.isNotNull(sharePutOnShelves.getShareStatus()), SharePutOnShelves::getShareStatus, sharePutOnShelves.getShareStatus())
 		;
@@ -145,6 +147,7 @@ public class SharePutOnShelvesController extends BladeController {
 		lambdaQueryWrapper.eq(SharePutOnShelves::getTenantId, AuthUtil.getTenantId())
 			.eq(SharePutOnShelves::getIsDeleted, 0)
 			.eq(ObjectUtils.isNotNull(sharePutOnShelves.getGoodsId()), SharePutOnShelves::getGoodsId, sharePutOnShelves.getGoodsId())
+			.eq(ObjectUtils.isNotNull(sharePutOnShelves.getGoodsCode()), SharePutOnShelves::getGoodsCode, sharePutOnShelves.getGoodsCode())
 			.eq( SharePutOnShelves::getBillType,1)
 			.eq( SharePutOnShelves::getShareStatus, "已确认");
 		List<SharePutOnShelves> list = sharePutOnShelvesService.list(lambdaQueryWrapper);

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/share/service/impl/SharePutOnShelvesServiceImpl.java

@@ -196,7 +196,7 @@ public class SharePutOnShelvesServiceImpl extends ServiceImpl<SharePutOnShelvesM
 			sharePutOnShelves.setProductLaunchId(item.getId());
 			sharePutOnShelves.setSrcTenantId(item.getTenantId());
 			sharePutOnShelves.setSrcSalesCompanyId(item.getSalesCompanyId());
-			sharePutOnShelves.setSrcSalesCompanyName(item.getSourceCompanyName());
+			sharePutOnShelves.setSrcSalesCompanyName(item.getSalesCompanyName());
 			sharePutOnShelves.setSrcGoodsId(item.getGoodsId());
 			sharePutOnShelves.setSrcGoodsCode(item.getCode());
 			sharePutOnShelves.setSrcGoodsName(item.getCname());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/ship/service/impl/ShipServiceImpl.java

@@ -932,9 +932,9 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				order.setLogisticsCorpName(ship.getLogisticsCorpName());
 				order.setExpressNo(ship.getExpressNo());
 				if (goodsNum.compareTo(sendNum) == 0) {//数量等于发货数量修改销售订单状态
+					order.setDeliveryBusinesDate(new Date());
 					order.setStatus(OrderTypeEnum.SHIPED.getType());
 					order.setXcxStatus(OrderTypeEnum.GOODSRECEIVED.getType());
-					order.setDeliveryBusinesDate(new Date());
 					orderMapper.updateById(order);
 				} else {
 					order.setStorageId(ship.getStorageId());
@@ -1402,9 +1402,9 @@ public class ShipServiceImpl extends ServiceImpl<ShipMapper, PjShip> implements
 				order.setGoodsTotalShipAmount(goodsTotalShipAmount);
 				order.setGoodsTotalShipNum(sendNum);
 			}
+			order.setDeliveryBusinesDate(null);
 			order.setStatus(OrderTypeEnum.XSDFH.getType());
 			order.setXcxStatus(OrderTypeEnum.XSDFH.getType());
-			order.setDeliveryBusinesDate(null);
 			orderMapper.updateById(order);
 		} else {
 			throw new RuntimeException("数据异常请联系管理员");

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shopping/controller/ShoppingMallDetailController.java

@@ -41,9 +41,9 @@ import org.springblade.salesPart.brand.service.IBrandFilesService;
 import org.springblade.salesPart.corps.service.ICorpsAttnService;
 import org.springblade.salesPart.corps.service.ICorpsDescService;
 import org.springblade.salesPart.entity.*;
-import org.springblade.salesPart.goods.service.IGoodsDescService;
 import org.springblade.salesPart.productLaunch.service.IProductLaunchFilesService;
-import org.springblade.salesPart.productLaunch.service.IProductLaunchService;
+import org.springblade.salesPart.share.entity.SharePutOnShelves;
+import org.springblade.salesPart.share.service.ISharePutOnShelvesService;
 import org.springblade.salesPart.shopping.entity.ShoppingMallDetail;
 import org.springblade.salesPart.shopping.service.IShoppingMallDetailService;
 import org.springblade.salesPart.shopping.vo.ShoppingMallDetailVO;
@@ -53,10 +53,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.validation.Valid;
 import java.math.BigDecimal;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -72,7 +69,6 @@ import java.util.stream.Collectors;
 public class ShoppingMallDetailController extends BladeController {
 
 	private final IShoppingMallDetailService shoppingMallDetailService;
-	private final IProductLaunchService productLaunchService;
 	private final IBrandFilesService brandFilesService;
 	private final IBrandDescService brandDescService;
 	private final IProductLaunchFilesService productLaunchFilesService;
@@ -80,8 +76,8 @@ public class ShoppingMallDetailController extends BladeController {
 	private final ICorpsDescService corpsDescService;//客户
 	private final ISysClient iSysClient;
 	private final IBrandFigureService brandFigureService;
-	private final IGoodsDescService goodsDescService;
 	private final StockDescMapper stockDescMapper;
+	private final ISharePutOnShelvesService sharePutOnShelvesService;
 
 	/**
 	 * 详情
@@ -259,6 +255,7 @@ public class ShoppingMallDetailController extends BladeController {
 		}
 		lambdaQueryWrapper.orderByAsc(ShoppingMallDetail::getCnameInt);
 		lambdaQueryWrapper.orderByDesc(ShoppingMallDetail::getInventory);
+		lambdaQueryWrapper.groupBy(ShoppingMallDetail::getGoodsCode);
 		IPage<ShoppingMallDetail> pages = shoppingMallDetailService.page(Condition.getPage(query), lambdaQueryWrapper);
 
 		if (CollectionUtils.isNotEmpty(pages.getRecords())) {
@@ -277,6 +274,7 @@ public class ShoppingMallDetailController extends BladeController {
 					.eq(ShoppingMallDetail::getBillType, 1)
 					.in(ShoppingMallDetail::getGoodsCode, codeList));
 			}
+			List<ShoppingMallDetail> mallDetails = new ArrayList<>();
 			for (ShoppingMallDetail item : pages.getRecords()) {
 				if (!shoppingMallDetailList.isEmpty()) {
 					ShoppingMallDetail shoppingMallDetail = shoppingMallDetailList.stream()
@@ -288,6 +286,14 @@ public class ShoppingMallDetailController extends BladeController {
 								.reduce(BigDecimal.ZERO, BigDecimal::add);
 							item.setInventory(item.getInventory().add(inventory));
 						}
+					} else {
+						if (!shoppingMallDetailShareList.isEmpty()) {
+							ShoppingMallDetail shoppingMallShareDetail = shoppingMallDetailShareList.stream()
+								.filter(e -> e.getGoodsCode().equals(item.getGoodsCode())).findFirst().orElse(null);
+							if (shoppingMallShareDetail != null) {
+								BeanUtil.copyProperties(shoppingMallShareDetail, item);
+							}
+						}
 					}
 				} else {
 					if (!shoppingMallDetailShareList.isEmpty()) {
@@ -298,6 +304,7 @@ public class ShoppingMallDetailController extends BladeController {
 						}
 					}
 				}
+				item.setCname(item.getGoodsName());
 				if (StringUtils.isNotBlank(corpsDesc.getPriceSystem())) {
 					if ("售价1".equals(corpsDesc.getPriceSystem())) {
 						item.setMallPrice(item.getPriceOne());
@@ -313,6 +320,7 @@ public class ShoppingMallDetailController extends BladeController {
 				} else {
 					item.setMallPrice(item.getPriceOne());
 				}
+				mallDetails.add(item);
 			}
 			List<PjProductLaunchFiles> pjProductLaunchFilesList = new ArrayList<>();
 			List<PjBrandFiles> pjBrandFilesList = new ArrayList<>();
@@ -329,7 +337,7 @@ public class ShoppingMallDetailController extends BladeController {
 				brandFigureList = brandFigureService.list(new QueryWrapper<BrandFigure>()
 					.in("pid", brandIds).eq("is_deleted", 0));
 			}
-			for (ShoppingMallDetail item : pages.getRecords()) {
+			for (ShoppingMallDetail item : mallDetails) {
 				if (!pjProductLaunchFilesList.isEmpty()) {
 					List<PjProductLaunchFiles> list = pjProductLaunchFilesList.stream().filter(e -> e.getPid().equals(item.getId())).collect(Collectors.toList());
 					if (!list.isEmpty()) {
@@ -395,6 +403,7 @@ public class ShoppingMallDetailController extends BladeController {
 					}
 				}
 			}
+			pages.setRecords(mallDetails);
 		}
 		return R.data(pages);
 	}
@@ -411,5 +420,56 @@ public class ShoppingMallDetailController extends BladeController {
 		return R.data(map);
 	}
 
+	/**
+	 * 小程序商品详情专用 - 共享
+	 */
+	@GetMapping("/listShareV1")
+	@ApiOperationSupport(order = 2)
+	public R<List<Map<String, Object>>> listShareV1(PjStockDesc stockDesc) {
+		List<Map<String, Object>> mapList = new ArrayList<>();
+		PjCorpsDesc corpsDesc = null;
+		//根据当前登录人获得客户
+		PjCorpsAttn corpsAttn = corpsAttnService.getAttn(AuthUtil.getUserId());
+		if (ObjectUtil.isNotEmpty(corpsAttn)) {
+			corpsDesc = corpsDescService.getCorpsDesc(corpsAttn.getPid());
+			if (ObjectUtil.isEmpty(corpsDesc)) {
+				throw new RuntimeException("未查到用户信息");
+			}
+		} else {
+			throw new RuntimeException("未查到用户信息");
+		}
+		LambdaQueryWrapper<ShoppingMallDetail> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(ShoppingMallDetail::getTenantId, AuthUtil.getTenantId())
+			.eq(ShoppingMallDetail::getIsDeleted, 0)
+			.eq(ShoppingMallDetail::getBillType, 0)
+			.eq(ObjectUtils.isNotEmpty(stockDesc.getCode()), ShoppingMallDetail::getGoodsCode, stockDesc.getCode());
+		String status1 = iSysClient.getParamService("whether.zero.inventory");
+		if (ObjectUtils.isNull(status1) || "0".equals(status1)) {
+			lambdaQueryWrapper.gt(ShoppingMallDetail::getInventory, 0);
+		}
+		lambdaQueryWrapper.orderByAsc(ShoppingMallDetail::getCnameInt);
+		lambdaQueryWrapper.orderByDesc(ShoppingMallDetail::getInventory);
+		ShoppingMallDetail shoppingMallDetail = shoppingMallDetailService.getOne(lambdaQueryWrapper);
+		if (shoppingMallDetail != null) {
+			Map<String, Object> map = new HashMap<>();
+			map.put("storageName", shoppingMallDetail.getSalesCompanyName());
+			map.put("storeInventory", shoppingMallDetail.getInventory());
+			mapList.add(map);
+		}
+		List<SharePutOnShelves> sharePutOnShelvesList = sharePutOnShelvesService.list(new LambdaQueryWrapper<SharePutOnShelves>()
+			.eq(SharePutOnShelves::getTenantId, AuthUtil.getTenantId())
+			.eq(SharePutOnShelves::getIsDeleted, 0)
+			.eq(SharePutOnShelves::getBillType, 1)
+			.eq(SharePutOnShelves::getShareStatus, "已确认")
+			.eq(SharePutOnShelves::getGoodsCode, stockDesc.getCode()));
+		for (SharePutOnShelves item : sharePutOnShelvesList) {
+			Map<String, Object> map = new HashMap<>();
+			map.put("storageName", item.getSrcSalesCompanyName());
+			map.put("storeInventory", item.getInventory());
+			mapList.add(map);
+		}
+		return R.data(mapList);
+	}
+
 
 }

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shopping/service/impl/ShoppingMallDetailServiceImpl.java

@@ -87,6 +87,7 @@ public class ShoppingMallDetailServiceImpl extends ServiceImpl<ShoppingMallDetai
 			}
 		}
 		detail.setGoodsNum(new BigDecimal(1));
+		detail.setCname(detail.getGoodsName());
 		List<PjProductLaunchFiles> pjProductLaunchFilesList = productLaunchFilesService.list(new QueryWrapper<PjProductLaunchFiles>()
 			.eq("pid", detail.getId()).eq("is_deleted", 0));
 		List<PjBrandFiles> pjBrandFilesList = brandFilesService.list(new QueryWrapper<PjBrandFiles>()

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -1027,10 +1027,10 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 					paymentType = "0";
 				}
 			}
-			if ("2".equals(paymentType)){
+			if ("2".equals(paymentType)) {
 				return generateOrderLimitShare(address, list, payType, corpsDesc, corpsAttn);
-			}else{
-                // 获取系统编号
+			} else {
+				// 获取系统编号
 				String billNo = serialService.getBillNo("WB", "WB", "WB");
 				if (ObjectUtils.isNull(billNo)) {
 					TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
@@ -1048,15 +1048,10 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 				List<PjOrderItems> orderItemsListShare = new ArrayList<>();
 				//保存销售主表信息-本地销售单
 				PjOrder order = new PjOrder();
-				if (list.size() == 1) {//如果只有一个公司，订单编号和主编号一致
-					order.setOrdNo(SrcOrdNo);
-				} else {
-					order.setOrdNo(SrcOrdNo + "-" + 1);
-				}
+				order.setOrdNo(SrcOrdNo);
 				order.setBusinesDate(new Date());
 				order.setSrcOrdNo(billNo);
 				order.setCreateUser(AuthUtil.getUserId());
-
 				//处理部门
 				int index = AuthUtil.getDeptId().indexOf(",");
 				Long deptId = null;
@@ -1195,7 +1190,12 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 				if (!orderItemsListShare.isEmpty()) {
 					//保存销售主表信息-共享销售单
 					PjOrder orderShare = new PjOrder();
-					orderShare.setOrdNo(SrcOrdNo + "-" + 2);
+					String srcOrdNoShare = serialService.getBillNo("GX", "GX", "GX");
+					if (ObjectUtils.isNull(srcOrdNoShare)) {
+						TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+						throw new RuntimeException("生成系统编号失败");
+					}
+					orderShare.setOrdNo(srcOrdNoShare);
 					orderShare.setBusinesDate(new Date());
 					orderShare.setSrcOrdNo(billNo);
 					orderShare.setCreateUser(AuthUtil.getUserId());
@@ -1232,8 +1232,8 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 					orderShare.setRecAddress(address);
 					orderShare.setContacts(corpsAttn.getCname());
 					orderShare.setPhone(corpsAttn.getTel());
-					orderShare.setBsType(OrderTypeEnum.SALES.getType());
-					orderShare.setBusinessSource("共享销售");
+					orderShare.setBsType("GX");
+					orderShare.setBusinessSource("外部销售");
 					orderShare.setReceivableType("网络支付");
 					orderShare.setBillType(1);
 					BigDecimal totalMoney = BigDecimal.ZERO;
@@ -1258,7 +1258,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 					}
 					amount = amount.add(orderShare.getTotalMoney());
 				}
-				if (!orderItemsList.isEmpty()){
+				if (!orderItemsList.isEmpty()) {
 					BigDecimal totalMoney = BigDecimal.ZERO;
 					order.setNumberRows(orderItemsList.size());//行数
 					//明细总数量
@@ -1288,15 +1288,15 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 					amount = amount.add(order.getTotalMoney());
 				}
 				R<Map<Object, Object>> r = payService.payPrepay(ids.substring(0, ids.length() - 1), amount, billNo, 0, goodsName.substring(0, goodsName.length() - 1), payType);
-				if ("1".equals(paymentType)){
-					if (ObjectUtils.isNotNull(r.getData().get("url"))){
+				if ("1".equals(paymentType)) {
+					if (ObjectUtils.isNotNull(r.getData().get("url"))) {
 						for (PjOrder item : pjOrderList) {
 							item.setPayUrl(r.getData().get("url").toString());
 						}
 					}
-					r.getData().put("type","1");
-				}else{
-					r.getData().put("type","0");
+					r.getData().put("type", "1");
+				} else {
+					r.getData().put("type", "0");
 				}
 				orderService.updateBatchById(pjOrderList);
 				return r;
@@ -1504,7 +1504,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 			orderShare.setContacts(corpsAttn.getCname());
 			orderShare.setPhone(corpsAttn.getTel());
 			orderShare.setBsType(OrderTypeEnum.SALES.getType());
-			orderShare.setBusinessSource("共享销售");
+			orderShare.setBusinessSource("额度支付");
 			orderShare.setReceivableType("网络支付");
 			orderShare.setBillType(1);
 			BigDecimal totalMoney = BigDecimal.ZERO;
@@ -1616,8 +1616,8 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 				}
 			}
 		}
-		Map<String,Object> map = new HashMap<>();
-		map.put("type","2");
+		Map<String, Object> map = new HashMap<>();
+		map.put("type", "2");
 		return R.data(map);
 	}
 

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/statistics/service/impl/StatisticsServiceImpl.java

@@ -102,7 +102,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(PjOrder::getBsType, "XS")
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))")
 			.apply("FIND_IN_SET( status, '已发货,已收货' ) and busines_date = CURDATE()"));
 		if (!pjOrderListD.isEmpty()) {
@@ -136,7 +135,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(PjOrder::getBsType, "XS")
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))")
 			.apply("FIND_IN_SET( status, '已发货,已收货' ) and DATE_FORMAT(busines_date, '%Y-%m') = DATE_FORMAT(CURRENT_DATE(), '%Y-%m')"));
 		if (!pjOrderListM.isEmpty()) {
@@ -188,7 +186,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.apply("find_in_set(status,'录入,待确认')")
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))")
 			.ge(!quer.getDateList().isEmpty(), PjOrder::getBusinesDate, quer.getDateList().get(0))
 			.le(!quer.getDateList().isEmpty(), PjOrder::getBusinesDate, quer.getDateList().get(1)));
@@ -328,7 +325,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.eq(PjOrder::getBsType, "XS")
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))")
 			.apply("status = '已发货' and busines_date = CURDATE()"));
 		if (!pjOrderList.isEmpty()) {
@@ -362,7 +358,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.le(PjOrder::getBusinesDate, endDate)
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))")
 			.apply("status = '已发货'"));
 		List<Map<String, Object>> list = new ArrayList<>();
@@ -412,7 +407,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.le(PjOrder::getBusinesDate, endDate)
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))")
 			.apply("status = '已发货'"));
 		List<Map<String, Object>> list = new ArrayList<>();
@@ -462,7 +456,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.le(PjOrder::getBusinesDate, endDate)
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3' )))")
 			.apply("status = '已发货'"));
 		List<Map<String, Object>> mapList = new ArrayList<>();
@@ -519,7 +512,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 			.le(PjOrder::getBusinesDate, endDate)
 			.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) ) " +
 				"OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-				"OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 				"OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))")
 			.apply("status = '已发货'"));
 		//销售
@@ -1533,7 +1525,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 				.eq(PjOrder::getBsType, "XS")
 				.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
 					" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-					" OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 					" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))")
 				.eq(ObjectUtils.isNotNull(corpBuySingular.getBusinessSource()), PjOrder::getBusinessSource, corpBuySingular.getBusinessSource())
 				.like(ObjectUtils.isNotNull(corpBuySingular.getSalerName()), PjOrder::getSalerName, corpBuySingular.getSalerName())
@@ -1591,7 +1582,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 				.eq(PjOrder::getBsType, "XS")
 				.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
 					" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-					" OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 					" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))")
 				.eq(ObjectUtils.isNotNull(corpBuySingular.getBusinessSource()), PjOrder::getBusinessSource, corpBuySingular.getBusinessSource())
 				.like(ObjectUtils.isNotNull(corpBuySingular.getSalerName()), PjOrder::getSalerName, corpBuySingular.getSalerName())
@@ -1649,7 +1639,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 				.eq(PjOrder::getBsType, "XS")
 				.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
 					" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-					" OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 					" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))")
 				.eq(ObjectUtils.isNotNull(corpBuySingular.getBusinessSource()), PjOrder::getBusinessSource, corpBuySingular.getBusinessSource())
 				.like(ObjectUtils.isNotNull(corpBuySingular.getSalerName()), PjOrder::getSalerName, corpBuySingular.getSalerName())
@@ -1702,7 +1691,6 @@ public class StatisticsServiceImpl implements IStatisticsService {
 				.eq(PjOrder::getBsType, "XS")
 				.apply("(( business_source = '外部销售' AND FIND_IN_SET( actual_payment_status, '2,3,4' ) )" +
 					" OR (business_source = '内部销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
-					" OR (business_source = '共享销售' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' ))" +
 					" OR (business_source = '额度支付' AND FIND_IN_SET( actual_payment_status, '0,1,2,3,4' )))")
 				.eq(ObjectUtils.isNotNull(corpBuySingular.getBusinessSource()), PjOrder::getBusinessSource, corpBuySingular.getBusinessSource())
 				.like(ObjectUtils.isNotNull(corpBuySingular.getSalerName()), PjOrder::getSalerName, corpBuySingular.getSalerName())

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/stock/controller/StockDescController.java

@@ -997,4 +997,74 @@ public class StockDescController extends BladeController {
 		return R.data(pages);
 	}
 
+	/**
+	 * 小程序商品详情专用
+	 */
+	/*@GetMapping("/listV1")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "分页", notes = "传入stockDesc")
+	public R<List<Map<String, Object>>> listV1(PjStockDesc stockDesc) {
+		List<Map<String, Object>> mapList = new ArrayList<>();
+		PjCorpsDesc corpsDesc = null;
+		//根据当前登录人获得客户
+		PjCorpsAttn corpsAttn = corpsAttnService.getAttn(AuthUtil.getUserId());
+		if (ObjectUtil.isNotEmpty(corpsAttn)) {
+			corpsDesc = corpsDescService.getCorpsDesc(corpsAttn.getPid());
+			if (ObjectUtil.isEmpty(corpsDesc)) {
+				throw new RuntimeException("未查到用户信息");
+			}
+		} else {
+			throw new RuntimeException("未查到用户信息");
+		}
+		LambdaQueryWrapper<PjStockDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+		lambdaQueryWrapper.eq(PjStockDesc::getTenantId, AuthUtil.getTenantId())
+			.eq(PjStockDesc::getIsDeleted, 0)
+			.eq(PjStockDesc::getSalesCompanyId, AuthUtil.getDeptId())//公司
+			.eq(ObjectUtil.isNotEmpty(stockDesc.getCode()), PjStockDesc::getCode, stockDesc.getCode())
+			.eq(ObjectUtil.isNotEmpty(stockDesc.getTypeno()), PjStockDesc::getTypeno, stockDesc.getTypeno())
+			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandId()), PjStockDesc::getBrandId, stockDesc.getBrandId())
+			.eq(ObjectUtil.isNotEmpty(stockDesc.getBrandName()), PjStockDesc::getBrandName, stockDesc.getBrandName())
+			.eq(ObjectUtil.isNotEmpty(stockDesc.getGoodsTypeId()), PjStockDesc::getGoodsTypeId, stockDesc.getGoodsTypeId())
+			.eq(ObjectUtil.isNotEmpty(stockDesc.getDot()), PjStockDesc::getDot, stockDesc.getDot())
+			.orderByDesc(PjStockDesc::getBalanceQuantity);
+		String status = iSysClient.getParamService("whether.zero.inventory");
+		if (ObjectUtils.isNull(status) || "0".equals(status)) {
+			lambdaQueryWrapper.gt(PjStockDesc::getBalanceQuantity, 0);
+		}
+		String management = iSysClient.getParamService("whether.branch.management");
+		if (ObjectUtils.isNotNull(management) && "1".equals(management)) {
+			if (ObjectUtils.isNotNull(corpsDesc.getDeliveryWarehouseId())) {
+				lambdaQueryWrapper.eq(PjStockDesc::getStorageId, corpsDesc.getDeliveryWarehouseId());
+			} else {
+				lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageId()), PjStockDesc::getStorageId, stockDesc.getStorageId())
+					.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageName()), PjStockDesc::getStorageName, stockDesc.getStorageName());
+			}
+		} else {
+			lambdaQueryWrapper.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageId()), PjStockDesc::getStorageId, stockDesc.getStorageId())
+				.eq(ObjectUtil.isNotEmpty(stockDesc.getStorageName()), PjStockDesc::getStorageName, stockDesc.getStorageName());
+		}
+		if (ObjectUtil.isNotEmpty(stockDesc.getCname())) {
+			PjGoodsDesc pjGoodsDescs = goodsDescService.getOne(new LambdaQueryWrapper<PjGoodsDesc>()
+				.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
+				.eq(PjGoodsDesc::getIsDeleted, 0)
+				.eq(PjGoodsDesc::getCname, stockDesc.getCname()));
+			if (pjGoodsDescs != null) {
+				lambdaQueryWrapper.eq(PjStockDesc::getCname, stockDesc.getCname());
+			} else {
+				lambdaQueryWrapper.eq(PjStockDesc::getCname, stockDesc.getCname());
+			}
+		}
+		lambdaQueryWrapper.orderByDesc(PjStockDesc::getBalanceQuantity);
+		List<PjStockDesc> list = stockDescService.list( lambdaQueryWrapper);
+		if (!list.isEmpty()) {
+			for (PjStockDesc item : list) {
+				Map<String, Object> map = new HashMap<>();
+				map.put("storageName", item.getStorageName());
+				map.put("storeInventory", item.getBalanceQuantity());
+				mapList.add(map);
+			}
+		}
+		return R.data(mapList);
+	}*/
+
 }