查询锁定订单，修改积分信息

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryItemsServiceImpl.java

@@ -317,9 +317,12 @@ public class DeliveryItemsServiceImpl extends ServiceImpl<DeliveryItemsMapper, D
 		}
 		stockGoods.setUpdateTime(new Date());
 		stockGoods.setUpdateUser(SecureUtil.getUserId());
-		R updateStock = stockGoodsClient.updateStock(stockGoods);
-		if (!updateStock.isSuccess()){
-			throw new RuntimeException("更新库存总账失败");
+		// todo 国内贸易暂定不更新库存
+		if (!tradeType.equals(OrderTypeEnum.DOMESTIC.getType())){
+			R updateStock = stockGoodsClient.updateStock(stockGoods);
+			if (!updateStock.isSuccess()){
+				throw new RuntimeException("更新库存总账失败");
+			}
 		}
 		return stockGoods;
 	}

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/controller/BusinessPointsController.java

@@ -122,7 +122,7 @@ public class BusinessPointsController extends BladeController {
 	@ApiOperationSupport(order = 6)
 	@ApiOperation(value = "新增或修改", notes = "传入businessPoints")
 	public R submit(@Valid @RequestBody BusinessPoints businessPoints) {
-		return R.status(businessPointsService.saveOrUpdate(businessPoints));
+		return R.data(businessPointsService.savePoints(businessPoints));
 	}
 
 

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/IBusinessPointsService.java

@@ -54,4 +54,9 @@ public interface IBusinessPointsService extends IService<BusinessPoints> {
 	 */
 	R updatePoints(Long corpId, BigDecimal convertIntegral,BigDecimal presenterIntegral, String type,Long srcPid, List<BusinessPointsItem> list,List<BusinessPointsItem> itemList);
 
+	/**
+	 * 保存修改积分
+	 */
+	BusinessPoints savePoints(BusinessPoints businessPoints);
+
 }

blade-service/blade-mocha-item/src/main/java/org/springblade/mocha/service/impl/BusinessPointsServiceImpl.java

@@ -161,4 +161,19 @@ public class BusinessPointsServiceImpl extends ServiceImpl<BusinessPointsMapper,
 		return R.success("操作成功");
 	}
 
+	@Override
+	public BusinessPoints savePoints(BusinessPoints businessPoints) {
+		if (businessPoints.getId() == null){
+			businessPoints.setTenantId(SecureUtil.getTenantId());
+			businessPoints.setCreateUser(SecureUtil.getUserId());
+			businessPoints.setCreateTime(new Date());
+			baseMapper.insert(businessPoints);
+		}else {
+			businessPoints.setUpdateUser(SecureUtil.getUserId());
+			businessPoints.setUpdateTime(new Date());
+			baseMapper.insert(businessPoints);
+		}
+		return businessPoints;
+	}
+
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/controller/OrderController.java

@@ -668,13 +668,9 @@ public class OrderController extends BladeController {
 	@GetMapping("/ListMessage")
 	@ApiOperationSupport(order = 9)
 	@ApiOperation(value = "分页", notes = "传入order")
-	public R<IPage<Order>> ListMessage(Order order, Query query) {
-		order.setIsDeleted(0);
-		order.setTenantId(SecureUtil.getTenantId());
-		order.setBillType(OrderTypeEnum.SALES.getType());
-		order.setTradeType(OrderTypeEnum.DOMESTIC.getType());
-
-		IPage<Order> pages = orderService.page(Condition.getPage(query), Condition.getQueryWrapper(order));
+	public R<IPage<OrderVO>> ListMessage(Query query,@RequestParam("itemId") Long itemId,
+									   @RequestParam("corpId") Long corpId) {
+		IPage<OrderVO> pages = orderService.orderInventory(Condition.getPage(query),SecureUtil.getTenantId(),OrderTypeEnum.DOMESTIC.getType(),OrderTypeEnum.SALES.getType(),itemId,corpId);
 		return R.data(pages);
 	}
 

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.java

@@ -17,6 +17,7 @@
 package org.springblade.purchase.sales.mapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.sun.javafx.collections.MappingChange;
 import com.trade.purchase.order.vo.OrderDTO;
 import org.apache.ibatis.annotations.Param;
 import org.springblade.purchase.sales.entity.Order;
@@ -26,6 +27,7 @@ import org.springblade.purchase.sales.vo.OrderVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 销售或采购订单表 Mapper 接口
@@ -48,4 +50,18 @@ public interface OrderMapper extends BaseMapper<Order> {
 
 	IPage<OrderStatisticAnalysisVO> listOrderStatisticAnalysis(Page<OrderStatisticAnalysisVO> page, @Param("tenantId")String tenantId, @Param("orderNo")String orderNo,@Param("startTime")String startTime,@Param("endTime")String endTime);
 
+	/**
+	 * 查询锁定库存订单
+	 * @param tenantId 租户
+	 * @param tradeType 贸易类型
+	 * @param billType 订单类型
+	 * @param itemId 商品id
+	 * @param corpId 供应商
+	 * @return
+	 */
+	List<OrderVO> orderInventory(IPage page,@Param("tenantId") String tenantId,
+											@Param("tradeType") String tradeType,
+											@Param("billType") String billType,
+											@Param("itemId") Long itemId,
+											@Param("corpId") Long corpId);
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/mapper/OrderMapper.xml

@@ -440,5 +440,24 @@
         </if>
 
     </select>
+    <select id="orderInventory"  resultType="org.springblade.purchase.sales.vo.OrderVO">
+        SELECT
+	bo.id,
+	bo.order_no,
+	bo.busines_date
+FROM
+	business_order bo
+	LEFT JOIN business_order_items item ON bo.id = item.pid
+WHERE
+	bo.is_deleted = '0'
+	AND bo.`status` = '3'
+	AND bo.settlment_amount = '0.00'
+	AND item.is_deleted = '0'
+	AND bo.tenant_id = #{tenantId}
+	AND bo.trade_type = #{tradeType}
+	AND bo.bill_type = #{billType}
+	AND item.item_id = #{itemId}
+	AND item.corp_id = #{corpId}
+    </select>
 
 </mapper>

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/IOrderService.java

@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 销售或采购订单表 服务类
@@ -95,4 +96,14 @@ public interface IOrderService extends IService<Order> {
 	void passCheck(Long id);
 
 	void passCancel(Long id);
+	/**
+	 * 查询锁定库存订单
+	 * @param tenantId 租户
+	 * @param tradeType 贸易类型
+	 * @param billType 订单类型
+	 * @param itemId 商品id
+	 * @param corpId 供应商
+	 * @return
+	 */
+	IPage<OrderVO> orderInventory(IPage<OrderVO> page,String tenantId,String tradeType,String billType, Long itemId,Long corpId);
 }

blade-service/blade-purchase-sales/src/main/java/org/springblade/purchase/sales/service/impl/OrderServiceImpl.java

@@ -730,4 +730,9 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
 		baseMapper.updateById(order);
 	}
 
+	@Override
+	public IPage<OrderVO> orderInventory(IPage<OrderVO> page,String tenantId, String tradeType, String billType, Long itemId, Long corpId) {
+		return page.setRecords(baseMapper.orderInventory(page,tenantId,tradeType,billType,itemId,corpId));
+	}
+
 }