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

blade-service-api/blade-project-api/src/main/java/org/springblade/project/entity/ServiceProject.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.annotation.TableLogic;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
+import org.springblade.core.mp.base.BaseEntity;
 import org.springblade.core.tenant.mp.TenantEntity;
 import org.springframework.format.annotation.DateTimeFormat;
 
@@ -25,7 +26,7 @@ import java.util.Map;
  */
 @Data
 @TableName("service_project")
-public class ServiceProject extends TenantEntity implements Serializable {
+public class ServiceProject  implements Serializable {
 	private static final long serialVersionUID = 1L;
 
 	//主键

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

@@ -0,0 +1,38 @@
+package org.springblade.purchase.sales.feign;
+
+
+import org.springblade.common.constant.LauncherConstant;
+import org.springblade.core.tool.api.R;
+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;
+
+/**
+ * @author caifc
+ * @date 2021-10-21 22:28
+ */
+@FeignClient(
+	value = LauncherConstant.APPLICATION_PURCHASE_SALES_NAME
+)
+public interface IOrderDescClient {
+	String API_PREFIX = "/client";
+	String UPDATE_ORDER=API_PREFIX+"/updateOrder";
+	String GET_BY_ORDER_NO=API_PREFIX+"/getByOrderNo";
+	String GET_BY_ID=API_PREFIX+"/getById";
+
+	/**
+	 * 修改采购订单状态
+	 * @param order
+	 * @return
+	 */
+	@PostMapping(UPDATE_ORDER)
+	R updateOrder(Order order);
+
+	@GetMapping(GET_BY_ORDER_NO)
+	Order getByOrder(String orderNo);
+
+	@GetMapping(GET_BY_ID)
+	Order getById(Long id);
+
+}

blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -34,7 +34,7 @@ import java.security.Security;
 import java.util.*;
 import java.util.stream.Collectors;
 
-@NonDS
+/*@NonDS*/
 @ApiIgnore
 @RestController
 @RequestMapping("/project")

blade-service/blade-project/src/main/java/org/springblade/project/service/ServiceProjectService.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.core.mp.base.BaseService;
 import org.springblade.core.tool.api.R;
 import org.springblade.project.entity.ServiceProject;
+import com.baomidou.mybatisplus.extension.service.IService;
 import org.springblade.project.entity.ServiceProjectItem;
 
 import javax.xml.crypto.Data;
@@ -21,7 +22,7 @@ import java.util.Map;
  * @email sunlightcs@gmail.com
  * @date 2021-10-26 13:50:49
  */
-public interface ServiceProjectService extends BaseService<ServiceProject>
+public interface ServiceProjectService extends IService<ServiceProject>
 {
     void modify(ServiceProject serviceProject);
 

blade-service/blade-project/src/main/java/org/springblade/project/service/impl/ServiceProjectServiceImpl.java

@@ -23,7 +23,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.util.CollectionUtils;
-
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
@@ -33,7 +33,7 @@ import java.util.stream.Collectors;
 
 
 @Service
-public class ServiceProjectServiceImpl extends BaseServiceImpl<ServiceProjectMapper, ServiceProject> implements ServiceProjectService
+public class ServiceProjectServiceImpl extends ServiceImpl<ServiceProjectMapper, ServiceProject> implements ServiceProjectService
 {
    @Resource
    private ServiceProjectMapper serviceProjectMapper;

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

@@ -0,0 +1,51 @@
+package org.springblade.purchase.sales.feign;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+
+
+import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
+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.RestController;
+
+@RestController
+@AllArgsConstructor
+public class OrderDescClient implements IOrderDescClient {
+
+	private final IOrderService iOrderService;
+
+	@Override
+	@Transactional
+	public R updateOrder(Order order)
+	{
+		if(order.getId()==null)
+		{
+			throw new SecurityException("修改状态失败");
+		}
+		iOrderService.updateById(order);
+		return R.success("操作成功");
+	}
+
+	@Override
+	@GetMapping(GET_BY_ORDER_NO)
+	public Order getByOrder(String orderNo)
+	{
+		LambdaQueryWrapper<Order> orderLambdaQueryWrapper=new LambdaQueryWrapper<>();
+		orderLambdaQueryWrapper.eq(Order::getTenantId, AuthUtil.getTenantId());
+		orderLambdaQueryWrapper.eq(Order::getIsDeleted, 0);
+		orderLambdaQueryWrapper.eq(Order::getOrderNo,orderNo);
+		return iOrderService.getOne(orderLambdaQueryWrapper, false);
+	}
+
+	@Override
+	@GetMapping(GET_BY_ID)
+	public Order getById(Long id) {
+		return iOrderService.getById(id);
+	}
+
+
+}

blade-service/trade-finance/pom.xml

@@ -81,6 +81,12 @@
             <version>2.8.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-purchase-sales</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

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

@@ -30,15 +30,18 @@ import com.trade.finance.mapper.ItemsMapper;
 import com.trade.finance.mapper.SettlementMapper;
 import com.trade.finance.service.ISettlementService;
 import com.trade.finance.vo.SettlementVO;
-import com.trade.purchase.order.entity.Order;
-import com.trade.purchase.order.feign.IOrderDescClient;
+import io.seata.spring.annotation.GlobalTransactional;
 import lombok.AllArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
 import org.springblade.client.entity.CorpsBank;
 import org.springblade.client.feign.ICorpsDescClient;
 import org.springblade.client.feign.IFeesDescClient;
 import org.springblade.client.feign.ISerialClient;
 import org.springblade.core.secure.utils.AuthUtil;
-import org.springblade.core.tool.api.R;
+import org.springblade.purchase.sales.entity.Order;
+import org.springblade.purchase.sales.feign.IOrderDescClient;
+import org.springblade.purchase.sales.feign.OrderDescClient;
+import org.springblade.purchase.sales.feign.OrderItemsClient;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -68,8 +71,8 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 	private AccMapper accMapper;
     @Autowired
 	private ICorpsDescClient corpsDescClient;
-
-/*    public final IOrderDescClient iOrderDescClient;*/
+	@Autowired
+    private  IOrderDescClient orderDescClient;
 
 
 
@@ -80,6 +83,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 	@Override
 	@Transactional
+	@GlobalTransactional
 	public void modify(SettlementDTO settlementDTO)
 	{
 		Settlement model=new Settlement();
@@ -142,6 +146,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 						e.setUpdateUser(AuthUtil.getUserId());
 						e.setUpdateUserName(AuthUtil.getUser().getRoleName());
 						itemsMapper.updateById(e);
+						payAcc(settlementDTO,e);
 					}
 
 
@@ -174,7 +179,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 
 	}
-
+    //修改财务账单和订单表已收金额
 	public void  payAcc(SettlementDTO settlementDTO,Items items)
 	{
 		Long accId = items.getAccId();
@@ -184,8 +189,16 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		   throw new SecurityException("扣款账单失败");
 		}
 		//结算成功后,更新acc表金额,采购收费 销售付费
-		acc.setSettlementAmount(acc.getSettlementAmount()!=null?acc.getSettlementAmount().add(items.getAmount()):new BigDecimal("0").add(items.getAmount()));
+		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());
+        if(client==null)
+        {
+        	throw new SecurityException("修改原单据失败");
+		}
+		client.setSettlmentAmount(client.getSettlmentAmount()!=null?client.getSettlmentAmount().add(items.getThisAmount()):new BigDecimal("0").add(items.getThisAmount()));
+		orderDescClient.updateOrder(client);
 	}
 
 	@Override

blade-service/trade-purchase/src/main/java/com/trade/purchase/PurchaseApplication.java

@@ -15,7 +15,7 @@ import org.springframework.context.annotation.ComponentScan;
  */
 @EnableBladeFeign
 @SpringCloudApplication
-@EnableFeignClients({"org.springblade", "com.trade.purchase.*"})
+@EnableFeignClients({"com.trade.purchase.*"})
 @ComponentScan(value = {"com.trade.purchase.*"})
 @MapperScan({"com.trade.purchase.**.mapper.**"})
 @SeataCloudApplication