修改财务

blade-service-api/blade-client-api/src/main/java/org/springblade/client/entity/GoodsDesc.java

@@ -225,7 +225,8 @@ public class GoodsDesc implements Serializable {
 	@ApiModelProperty(value = "兑换积分")
 	private BigDecimal integral;
 
-
+	@TableField(exist = false)
+    private String goodsTypeName;
 
 
 

blade-service/blade-client/src/main/java/org/springblade/client/goods/controller/GoodsDescController.java

@@ -41,10 +41,8 @@ import org.springblade.client.goods.excel.GoodsExcel;
 import org.springblade.client.goods.excel.GoodsImport;
 import org.springblade.client.goods.excel.GoodsInfoExcel;
 import org.springblade.client.goods.excel.GoodsOutExcel;
-import org.springblade.client.goods.service.IGoodsFilesService;
-import org.springblade.client.goods.service.IGoodsPriceService;
+import org.springblade.client.goods.service.*;
 import org.springblade.core.excel.util.ExcelUtil;
-import org.springblade.client.goods.service.IGoodsSpecificationService;
 import org.springblade.core.mp.support.Condition;
 import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.AuthUtil;
@@ -56,7 +54,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.client.vo.GoodsDescVO;
-import org.springblade.client.goods.service.IGoodsDescService;
 import org.springblade.core.boot.ctrl.BladeController;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -83,6 +80,8 @@ public class GoodsDescController extends BladeController {
 	private IGoodsFilesService goodsFilesService;
     @Autowired
 	private IGoodsSpecificationService goodsSpecificationService;
+
+    private final IGoodsTypeService goodsDescType;
 	/**
 	 * 详情
 	 */
@@ -130,6 +129,17 @@ public class GoodsDescController extends BladeController {
 		    .orderByDesc(GoodsDesc::getCreateTime);
 		Page<GoodsDesc> page=new Page<>(current,size);
 		IPage<GoodsDesc> iPage=goodsDescService.page(page,goodsDescLambdaQueryWrapper);
+		if(CollectionUtils.isNotEmpty(iPage.getRecords()))
+		{
+			iPage.getRecords().forEach(e->{
+				String TypeId = e.getGoodsTypeId();
+				GoodsType goodsType = goodsDescType.getById(Long.valueOf(TypeId));
+				if(goodsType!=null)
+				{
+					e.setGoodsTypeName(goodsType.getCname());
+				}
+			});
+		}
 		return R.data(iPage);
 	}
 

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

@@ -218,6 +218,7 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 				Settlement settlement = baseMapper.selectById(model.getId());
 				Order order = orderDescClient.getById(settlement.getSrcOrderno());
 				if(order==null)
+				if(order==null)
 				{
 					throw new SecurityException("结算未发现订单信息");
 				}
@@ -672,8 +673,11 @@ public class SettlementServiceImpl extends ServiceImpl<SettlementMapper, Settlem
 		itemsList.forEach(e->{
 			if(e.getSrcType()==2)
 			{
-				OrderFees orderFees=new OrderFees();
-				orderFees.setId(e.getSrcFeesId());
+				OrderFees orderFees = orderFeesClient.getById(e.getSrcFeesId());
+				if(orderFees==null)
+				{
+					throw new SecurityException("未查到原单据的费用明细,无法修改状态");
+				}
 				orderFees.setIsCheck(1);
 				R submit = orderFeesClient.submit(orderFees);
 				if(!submit.isSuccess())