提交主营项目

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/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/trade-finance/src/main/java/com/trade/finance/service/impl/SettlementServiceImpl.java

@@ -32,6 +32,7 @@ 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.springblade.client.entity.CorpsBank;
 import org.springblade.client.feign.ICorpsDescClient;
@@ -80,6 +81,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 
 	@Override
 	@Transactional
+	@GlobalTransactional
 	public void modify(SettlementDTO settlementDTO)
 	{
 		Settlement model=new Settlement();
@@ -142,6 +144,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 						e.setUpdateUser(AuthUtil.getUserId());
 						e.setUpdateUserName(AuthUtil.getUser().getRoleName());
 						itemsMapper.updateById(e);
+						payAcc(settlementDTO,e);
 					}
 
 
@@ -184,8 +187,9 @@ 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);
+		//修改原业务表数据
 	}
 
 	@Override