2024年1月29日17:29:58

blade-service/blade-los/src/main/java/org/springblade/los/business/aea/controller/AeaBillsController.java

@@ -88,7 +88,7 @@ public class AeaBillsController extends BladeController {
 			AeaBills::getAmountDrLoc, AeaBills::getAmountCrLoc, AeaBills::getAmountProfitLoc, AeaBills::getCheckCrStatusDescr, AeaBills::getCheckDrStatusDescr,
 			AeaBills::getStlCrStatusDescr, AeaBills::getStlDrStatusDescr, AeaBills::getInvoiceCrStatusDescr, AeaBills::getInvoiceDrStatusDescr, AeaBills::getCreateUserName,
 			AeaBills::getCreateTime, AeaBills::getUpdateUserName, AeaBills::getUpdateTime, AeaBills::getStatus, AeaBills::getBillStatus,
-			AeaBills::getAccountStatus, AeaBills::getRemarks, AeaBills::getPackingUnit, AeaBills::getBillDate,AeaBills::getTeamName);
+			AeaBills::getAccountStatus, AeaBills::getRemarks, AeaBills::getPackingUnit, AeaBills::getBillDate,AeaBills::getTeamName,AeaBills::getCreateUser);
 		lambdaQueryWrapper.eq(AeaBills::getIsDeleted, 0)
 			.eq(AeaBills::getTenantId, AuthUtil.getTenantId())
 			.and(i -> i.isNull(AeaBills::getMasterId).or()

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/controller/BillsController.java

@@ -86,7 +86,7 @@ public class BillsController extends BladeController {
 			Bills::getAmountDrLoc, Bills::getAmountCrLoc, Bills::getAmountProfitLoc, Bills::getCheckCrStatusDescr, Bills::getCheckDrStatusDescr,
 			Bills::getStlCrStatusDescr, Bills::getStlDrStatusDescr, Bills::getInvoiceCrStatusDescr, Bills::getInvoiceDrStatusDescr, Bills::getCreateUserName,
 			Bills::getCreateTime, Bills::getUpdateUserName, Bills::getUpdateTime, Bills::getStatus, Bills::getBillStatus,
-			Bills::getAccountStatus, Bills::getRemarks, Bills::getPackingUnit, Bills::getBillDate, Bills::getTeamName);
+			Bills::getAccountStatus, Bills::getRemarks, Bills::getPackingUnit, Bills::getBillDate, Bills::getTeamName,Bills::getCreateUser);
 		lambdaQueryWrapper.eq(Bills::getIsDeleted, 0)
 			.eq(Bills::getTenantId, AuthUtil.getTenantId())
 			.and(i -> i.isNull(Bills::getMasterId).or()

blade-service/blade-los/src/main/java/org/springblade/los/business/sea/service/impl/BillsServiceImpl.java

@@ -1014,8 +1014,11 @@ public class BillsServiceImpl extends ServiceImpl<BillsMapper, Bills> implements
 			auditProecessDTO.setBillTime(declare.getCreateTime());
 			auditProecessDTO.setTenantId(AuthUtil.getTenantId());
 			auditProecessDTO.setCorpId(declare.getCorpId());
-			auditProecessDTO.setSalesCompanyId(Long.parseLong(declare.getCreateDept()));
-			auditProecessDTO.setSalesCompanyName(declare.getCreateDeptName());
+			Dept dept = deptUtils.getDept(declare.getCreateDept());
+			if (dept != null){
+				auditProecessDTO.setSalesCompanyId(dept.getId());
+				auditProecessDTO.setSalesCompanyName(dept.getDeptName());
+			}
 			auditProecessDTO.setPayAmount(declare.getAmountCrLoc());
 			auditProecessDTO.setReceivableAmount(declare.getAmountDrLoc());
 			auditProecessDTO.setGrossProfit(declare.getAmountProfitLoc());

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/controller/FinAccBillsController.java

@@ -46,6 +46,7 @@ import javax.validation.Valid;
 import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -448,5 +449,16 @@ public class FinAccBillsController extends BladeController {
 		return R.data(bCorpsList);
 	}
 
+	/**
+	 * 客户欠款情况
+	 */
+	@GetMapping("/listFeeCountByCorp")
+	@ApiOperationSupport(order = 2)
+	@ApiOperation(value = "类别", notes = "传入finAccBills")
+	public R<List<Map<String,Object>>> listFeeCountByCorp(String dc,Long corpId) {
+		List<Map<String,Object>> mapList = finAccBillsService.listFeeCountByCorp(dc,corpId);
+		return R.data(mapList);
+	}
+
 
 }

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.java

@@ -16,11 +16,14 @@
  */
 package org.springblade.los.finance.fee.mapper;
 
-import org.springblade.los.finance.fee.entity.FinAccBills;
-import org.springblade.los.finance.fee.vo.FinAccBillsVO;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.annotations.Param;
+import org.springblade.los.finance.fee.entity.FinAccBills;
+import org.springblade.los.finance.fee.vo.FinAccBillsVO;
+
 import java.util.List;
+import java.util.Map;
 
 /**
  * 业务-财务账单 Mapper 接口
@@ -39,4 +42,7 @@ public interface FinAccBillsMapper extends BaseMapper<FinAccBills> {
 	 */
 	List<FinAccBillsVO> selectFinAccBillsPage(IPage page, FinAccBillsVO finAccBills);
 
+	List<Map<String, Object>> listFeeCountByCorp(@Param("dc") String dc, @Param("tenantId") String tenantId,
+												 @Param("deptPid") Long deptPid, @Param("postId") String postId
+		, @Param("corpId") Long corpId);
 }

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/mapper/FinAccBillsMapper.xml

@@ -96,5 +96,43 @@
     <select id="selectFinAccBillsPage" resultMap="finAccBillsResultMap">
         select * from los_fin_acc_bills where is_deleted = 0
     </select>
+    <select id="listFeeCountByCorp" resultType="java.util.Map">
+        SELECT
+            corp_cn_name as corpCnName,
+            mblno as mblno,
+            SUM( amount_dr ) as amountDr,
+            SUM( amount_cr ) as amountCr,
+            SUM( amount_dr_usd ) as amountDrUsd,
+            SUM( amount_cr_usd ) as amountCrUsd,
+            SUM( amount_dr_loc ) as amountDrLoc,
+            SUM( amount_cr_loc ) as amountCrLoc,
+            SUM( stl_amount_dr ) as stlAmountDr,
+            SUM( stl_amount_cr ) as stlAmountCr,
+            SUM( stl_amount_dr_usd ) as stlAmountDrUsd,
+            SUM( stl_amount_cr_usd ) as stlAmountCrUsd,
+            SUM( stl_amount_cr_loc ) as stlAmountCrLoc,
+            SUM( stl_amount_dr_loc ) as stlAmountDrLoc
+        FROM
+            `los_fin_acc_bills`
+        WHERE
+            is_deleted = '0'
+        <if test='tenantId != null and tenantId != ""'>
+            and tenant_id = #{tenantId}
+        </if>
+        <if test='dc != null and dc != ""'>
+            and account_dc = #{dc}
+        </if>
+        <if test='deptPid != null'>
+            and branch_id = #{deptPid}
+        </if>
+          <if test='postId != null and postId != ""'>
+            and team_id = #{postId}
+        </if>
+          <if test='corpId != null'>
+            and corp_id = #{corpId}
+        </if>
+        GROUP BY
+            mblno
+    </select>
 
 </mapper>

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/IFinAccBillsService.java

@@ -24,6 +24,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 业务-财务账单 服务类
@@ -76,4 +77,6 @@ public interface IFinAccBillsService extends IService<FinAccBills> {
 	 * @return
 	 */
 	FinAccBillsVO listByAccBillId(ListAccBillVO finAccBills);
+
+    List<Map<String, Object>> listFeeCountByCorp(String dc,Long corpId);
 }

blade-service/blade-los/src/main/java/org/springblade/los/finance/fee/service/impl/FinAccBillsServiceImpl.java

@@ -90,7 +90,6 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 	private final FinStlBillsMapper finStlBillsMapper;
 
 	private final FinVouchersItemsMapper finVouchersItemsMapper;
-	private final FinVouchersMapper finVouchersMapper;
 
 	@Override
 	public IPage<FinAccBillsVO> selectFinAccBillsPage(IPage<FinAccBillsVO> page, FinAccBillsVO finAccBills) {
@@ -454,6 +453,12 @@ public class FinAccBillsServiceImpl extends ServiceImpl<FinAccBillsMapper, FinAc
 		return billsMapper.listByAccBillId(finAccBills);
 	}
 
+	@Override
+	public List<Map<String, Object>> listFeeCountByCorp(String dc,Long corpId) {
+		List<Map<String, Object>> mapList = baseMapper.listFeeCountByCorp(dc,AuthUtil.getTenantId(),deptUtils.getDeptPid(),AuthUtil.getPostId(),corpId);
+		return mapList;
+	}
+
 	private static <T> Predicate<T> distinctByKey(Function<? super T, ?> keyExtractor) {
 		Set<Object> seen = ConcurrentHashMap.newKeySet();
 		return t -> seen.add(keyExtractor.apply(t));

blade-service/blade-los/src/main/java/org/springblade/los/finance/stl/service/impl/FinStlBillsServiceImpl.java

@@ -384,7 +384,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 			throw new RuntimeException("请选择明细");
 		}
 		detail.setStatus(3);
-		detail.setIsChecked(1);
+		detail.setBillStatus("1");
 		baseMapper.updateById(detail);
 		return R.data(detail);
 	}
@@ -579,7 +579,7 @@ public class FinStlBillsServiceImpl extends ServiceImpl<FinStlBillsMapper, FinSt
 			throw new RuntimeException("请选择明细");
 		}
 		detail.setStatus(0);
-		detail.setIsChecked(2);
+		detail.setBillStatus("0");
 		baseMapper.updateById(detail);
 		return R.data(detail);
 	}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/shoppingCart/service/impl/ShoppingCartServiceImpl.java

@@ -292,7 +292,7 @@ public class ShoppingCartServiceImpl extends ServiceImpl<ShoppingCartMapper, PjS
 							order.setFreight(new BigDecimal(5));
 						}
 						amount = amount.add(totalMoney);
-						order.setPaymentAmountTl(totalMoney);
+//						order.setPaymentAmountTl(totalMoney);
 						order.setSharedCompanyId(shoppingCartList.get(0).getSharedCompanyId());
 						order.setSharedCompanyName(shoppingCartList.get(0).getSharedCompanyName());
 					}