Merge remote-tracking branch 'origin/dev' into dev

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

@@ -193,6 +193,12 @@ public class PjProductLaunch implements Serializable {
 	private String sharedCompany;
 
 	/**
+	 * 共享公司list(用于查询)
+	 */
+	@TableField(exist = false)
+	private String sharedCompanyList;
+
+	/**
 	 * 附件明细集合
 	 */
 	@TableField(exist = false)

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/mapper/CorpsDescMapper.xml

@@ -69,10 +69,10 @@
             and salesman_name like CONCAT(CONCAT('%', #{corpsDesc.salesmanName}), '%')
         </if>
         <if test="corpsDesc.tel!=null and corpsDesc.tel != ''">
-            and tel = #{corpsDesc.tel}
+            and tel like CONCAT(CONCAT('%', #{corpsDesc.tel}), '%')
         </if>
         <if test="corpsDesc.remarks!=null and corpsDesc.remarks != ''">
-            and remarks = #{corpsDesc.remarks}
+            and remarks like CONCAT(CONCAT('%', #{corpsDesc.remarks}), '%')
         </if>
         <if test="corpsDesc.tenantId!=null and corpsDesc.tenantId != ''">
             and tenant_id = #{corpsDesc.tenantId}
@@ -86,6 +86,9 @@
         <if test="corpsDesc.status!=null and corpsDesc.status != ''">
             and status = #{corpsDesc.status}
         </if>
+        <if test="corpsDesc.enableOrNot != null and corpsDesc.enableOrNot != ''">
+            and enable_or_not = #{corpsDesc.enableOrNot}
+        </if>
         <if test='corpsDesc.typeList !=null and corpsDesc.typeList.size>0'>
             and id in (
             SELECT

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/goods/controller/GoodsDescController.java

@@ -310,8 +310,7 @@ public class GoodsDescController extends BladeController {
 	public R<List<PjGoodsDesc>> goodsListAll(PjGoodsDesc goods) {
 		LambdaQueryWrapper<PjGoodsDesc> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.eq(PjGoodsDesc::getTenantId, AuthUtil.getTenantId())
-			.eq(PjGoodsDesc::getIsDeleted, 0)
-			.eq(PjGoodsDesc::getSalesCompanyId, AuthUtil.getDeptId());
+			.eq(PjGoodsDesc::getIsDeleted, 0);
 		if (ObjectUtil.isNotEmpty(goods.getCname())){//商品名称
 			lambdaQueryWrapper.and(i -> i.like(PjGoodsDesc::getCname, goods.getCname()).or().like(PjGoodsDesc::getCnameInt, goods.getCname()));
 		}

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

@@ -677,9 +677,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 						stockOne.setBalanceQuantity(stockOne.getBalanceQuantity().add(item.getSendNum()));
 						stockOne.setStoreInventory(stockOne.getBalanceQuantity());
 
+						//库存金额
 						BigDecimal inventoryAmount = item.getSendNum().multiply(item.getPrice());
 						stockOne.setInventoryAmount(stockOne.getInventoryAmount().add(inventoryAmount));
 
+						//库存成本价
 						stockOne.setInventoryCostPrice(stockOne.getInventoryAmount().divide(stockOne.getBalanceQuantity(), MathContext.DECIMAL32).setScale(2, RoundingMode.HALF_UP));
 						stockDescMapper.updateById(stockOne);
 					}
@@ -720,6 +722,10 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 			//生成历史记录
 			saveHistory(order.getId(), "已退款");
 
+			/** ----------------------调用退款接口---------------------- */
+
+			/** ----------------------调用退款接口---------------------- */
+
 			if (OrderTypeEnum.WEB.getType().equals(order.getBusinessSource())){
 				order.setStatus("已取消");
 			}else {
@@ -795,7 +801,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, PjOrder> implemen
 	 * 生成工单历史记录
 	 */
 	public void saveHistory(Long pid, String status){
-		//生成出库工单历史记录
+		//生成工单历史记录
 		PjHistory history = new PjHistory();
 		history.setTenantId(AuthUtil.getTenantId());
 		history.setCreateUser(AuthUtil.getUserId());

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/productLaunch/controller/ProductLaunchController.java

@@ -98,9 +98,9 @@ public class ProductLaunchController extends BladeController {
 			.eq(PjProductLaunch::getIsDeleted, 0)
 			.eq(PjProductLaunch::getBillType, productLaunch.getBillType())
 			.eq(PjProductLaunch::getSalesCompanyId, AuthUtil.getDeptId())//公司
-			.eq(ObjectUtil.isNotEmpty(productLaunch.getBrandId()), PjProductLaunch::getBrandId, productLaunch.getBrandId())
 			.like(ObjectUtils.isNotEmpty(productLaunch.getSpecificationAndModel()), PjProductLaunch::getSpecificationAndModel, productLaunch.getSpecificationAndModel())//规格型号
-			.in(ObjectUtil.isNotEmpty(productLaunch.getSourceCompanyId()), PjProductLaunch::getSourceCompanyId, productLaunch.getSourceCompanyId());//来源公司
+			.eq(ObjectUtil.isNotEmpty(productLaunch.getUpAndDownShelves()), PjProductLaunch::getUpAndDownShelves, productLaunch.getUpAndDownShelves())//上下架
+			.in(ObjectUtil.isNotEmpty(productLaunch.getSharedCompanyList()), PjProductLaunch::getSharedCompanyList, productLaunch.getSharedCompanyList());//共享公司
 		if (ObjectUtil.isNotEmpty(productLaunch.getCname())){
 			lambdaQueryWrapper.and(i -> i.like(PjProductLaunch::getCname, productLaunch.getCname()).or().like(PjProductLaunch::getCnameInt, productLaunch.getCname()));
 		}

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

@@ -309,6 +309,7 @@ public class ProductLaunchServiceImpl extends ServiceImpl<ProductLaunchMapper, P
 				productLaunch.setId(one.getId());
 				productLaunch.setUpdateUser(AuthUtil.getUserId());
 				productLaunch.setUpdateTime(new Date());
+				productLaunch.setSharedCompany(one.getSharedCompany());
 				baseMapper.updateById(productLaunch);
 			}
 		});