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

blade-service-api/blade-purchase-sales-api/src/main/java/org/springblade/purchase/sales/feign/IOrderDescClient.java

@@ -7,6 +7,8 @@ import org.springblade.purchase.sales.entity.Order;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  * @author caifc
@@ -27,12 +29,12 @@ public interface IOrderDescClient {
 	 * @return
 	 */
 	@PostMapping(UPDATE_ORDER)
-	R updateOrder(Order order);
+	R updateOrder(@RequestBody Order order);
 
 	@GetMapping(GET_BY_ORDER_NO)
 	Order getByOrder(String orderNo);
 
 	@GetMapping(GET_BY_ID)
-	Order getById(Long id);
+	Order getById(@RequestParam("id") Long id);
 
 }

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

@@ -5,13 +5,18 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 
 import lombok.AllArgsConstructor;
 import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.purchase.sales.entity.Order;
 import org.springblade.purchase.sales.service.IOrderService;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RestController;
+import springfox.documentation.annotations.ApiIgnore;
 
+@NonDS
+@ApiIgnore()
 @RestController
 @AllArgsConstructor
 public class OrderDescClient implements IOrderDescClient {
@@ -19,7 +24,7 @@ public class OrderDescClient implements IOrderDescClient {
 	private final IOrderService iOrderService;
 
 	@Override
-	@Transactional
+	@PostMapping(UPDATE_ORDER)
 	public R updateOrder(Order order)
 	{
 		if(order.getId()==null)

blade-service/trade-finance/src/main/java/com/trade/finance/service/impl/SettlementServiceImpl.java

@@ -71,7 +71,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	private AccMapper accMapper;
     @Autowired
 	private ICorpsDescClient corpsDescClient;
-	@Autowired
+
     private  IOrderDescClient orderDescClient;
 
 
@@ -192,7 +192,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		acc.setSettlementAmount(acc.getSettlementAmount()!=null?acc.getSettlementAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
 		accMapper.updateById(acc);
 		//修改原业务表数据
-		Order client = orderDescClient.getById(acc.getSrcParentId());
+		Long srcParentId = acc.getSrcParentId();
+		Order client = orderDescClient.getById(srcParentId);
         if(client==null)
         {
         	throw new SecurityException("修改原单据失败");