2024年10月11日17:25:39

blade-service-api/blade-sales-part-api/src/main/java/org/springblade/salesPart/entity/PjCorpsDesc.java

@@ -315,4 +315,16 @@ public class PjCorpsDesc implements Serializable {
 	@ApiModelProperty(value = "小程序二维码")
 	private String filePath;
 
+	/**
+	 * 经度
+	 */
+	@ApiModelProperty(value = "经度")
+	private String longitude;
+
+	/**
+	 * 维度
+	 */
+	@ApiModelProperty(value = "维度")
+	private String dimension;
+
 }

blade-service/blade-deliver-goods/src/main/java/org/springblade/deliver/goods/service/impl/DeliveryServiceImpl.java

@@ -838,7 +838,6 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				|| "681169".equals(AuthUtil.getTenantId())) {
 				R<List<OrderItems>> r = iOrderItemsClient.selectList(select.getSrcId());
 				if (r.isSuccess() && ObjectUtils.isNotNull(r.getData())) {
-					List<DeliverStockGoods> finalStockGoodsList1 = stockGoodsList;
 					List<DeliverStockGoods> stockGoodsList2 = new ArrayList<>();
 
 					//获取去重之后数据
@@ -854,7 +853,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 						model.setGoodsId(e.getItemId());
 						//不同的出口对应不同的查询条件
 						if ("GN".equals(select.getTradeType())) {
-							model = finalStockGoodsList1.stream().filter(s ->
+							model = stockGoodsList.stream().filter(s ->
 								s.getGoodsId().equals(e.getItemId())
 									&& s.getTradeType().equals("GN")
 									&& s.getCorpId().equals(select.getCorpId())
@@ -965,7 +964,7 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 				model.setGoodsId(e.getItemId());
 				//不同的出口对应不同的查询条件
 				if ("JK".equals(select.getTradeType())) {
-					model = finalStockGoodsList.stream().filter(s ->
+					model = stockGoodsList.stream().filter(s ->
 						s.getGoodsId().equals(e.getItemId())
 							&& s.getTradeType().equals("JK")
 							&& s.getCntrNo().equals(e.getCntrNo())//箱号
@@ -974,13 +973,13 @@ public class DeliveryServiceImpl extends ServiceImpl<DeliveryMapper, Delivery> i
 							&& s.getContractNumber().equals(e.getContractNumber())//采购订单号
 					).findFirst().orElse(null);
 				} else if ("CK".equals(select.getTradeType())) {
-					model = finalStockGoodsList.stream().filter(s ->
+					model = stockGoodsList.stream().filter(s ->
 						s.getGoodsId().equals(e.getItemId())
 							&& s.getTradeType().equals("CK")
 							&& s.getItemType().equals(e.getSpecificationAndModel())
 					).findFirst().orElse(null);
 				} else if ("GN".equals(select.getTradeType())) {
-					model = finalStockGoodsList.stream().filter(s ->
+					model = stockGoodsList.stream().filter(s ->
 						s.getGoodsId().equals(e.getItemId())
 							&& s.getTradeType().equals("GN")
 							&& s.getCorpId().equals(select.getCorpId())

blade-service/blade-los/src/main/java/org/springblade/los/app/controller/IndexController.java

@@ -0,0 +1,59 @@
+package org.springblade.los.app.controller;
+
+import io.swagger.annotations.Api;
+import lombok.AllArgsConstructor;
+import org.springblade.core.boot.ctrl.BladeController;
+import org.springblade.core.tool.api.R;
+import org.springblade.los.app.service.IndexService;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author :jixinyuan
+ * @date : 2024/10/11
+ */
+@RestController
+@AllArgsConstructor
+@RequestMapping("/app/index")
+@Api(value = "贸易代理app首页统计", tags = "贸易代理app首页统计接口")
+public class IndexController extends BladeController {
+
+	private final IndexService indexService;
+
+	/**
+	 * 利润
+	 */
+	@GetMapping("/profit")
+	public R profit(@RequestParam("type") String type, @RequestParam("startDate") String startDate,
+					@RequestParam("endDate") String endDate) {
+		return indexService.profit(type, startDate, endDate);
+	}
+
+	/**
+	 * 总货量
+	 */
+	@GetMapping("/totalCargoVolume")
+	public R totalCargoVolume(@RequestParam("type") String type, @RequestParam("startDate") String startDate,
+					@RequestParam("endDate") String endDate) {
+		return indexService.totalCargoVolume(type, startDate, endDate);
+	}
+
+	/**
+	 * 有效客户数量
+	 */
+	@GetMapping("/effectiveCorp")
+	public R effectiveCorp(@RequestParam("type") String type) {
+		return indexService.effectiveCorp(type);
+	}
+
+	/**
+	 * 流失客户数量
+	 */
+	@GetMapping("/lossCorp")
+	public R lossCorp(@RequestParam("type") String type) {
+		return indexService.lossCorp(type);
+	}
+
+}

blade-service/blade-los/src/main/java/org/springblade/los/app/service/IndexService.java

@@ -0,0 +1,17 @@
+package org.springblade.los.app.service;
+
+import org.springblade.core.tool.api.R;
+
+/**
+ * @author :jixinyuan
+ * @date : 2024/10/11
+ */
+public interface IndexService {
+	R profit(String type, String startDate, String endDate);
+
+	R totalCargoVolume(String type, String startDate, String endDate);
+
+	R effectiveCorp(String type);
+
+	R lossCorp(String type);
+}

blade-service/blade-los/src/main/java/org/springblade/los/app/service/impl/IndexServiceImpl.java

@@ -0,0 +1,63 @@
+package org.springblade.los.app.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
+import lombok.AllArgsConstructor;
+import org.springblade.core.secure.utils.AuthUtil;
+import org.springblade.core.tool.api.R;
+import org.springblade.los.Util.IDeptUtils;
+import org.springblade.los.app.service.IndexService;
+import org.springblade.los.business.aea.mapper.AeaBillsMapper;
+import org.springblade.los.business.amends.mapper.AmendsMapper;
+import org.springblade.los.business.customsDeclaration.mapper.CustomsDeclarationMapper;
+import org.springblade.los.business.sea.entity.Bills;
+import org.springblade.los.business.sea.mapper.BillsMapper;
+import org.springblade.los.finance.fee.mapper.FinAccBillsMapper;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * @author :jixinyuan
+ * @date : 2024/10/11
+ */
+@Service
+@AllArgsConstructor
+public class IndexServiceImpl implements IndexService {
+
+	private final BillsMapper billsMapper;
+	private final AeaBillsMapper aeaBillsMapper;
+	private final CustomsDeclarationMapper customsDeclarationMapper;
+	private final AmendsMapper amendsMapper;
+	private final FinAccBillsMapper finAccBillsMapper;
+	private final IDeptUtils deptUtils;
+
+	@Override
+	public R profit(String type, String startDate, String endDate) {
+
+		List<Bills> billsList = billsMapper.selectList(new LambdaQueryWrapper<Bills>()
+			.eq(Bills::getTenantId, AuthUtil.getTenantId())
+			.eq(Bills::getIsDeleted, 0)
+				.apply("find_in_set(bill_type,'DD,MM')")
+			.eq(ObjectUtils.isNotNull(type),Bills::getBranchId, type)
+			.ge(ObjectUtils.isNotNull(startDate), Bills::getBillDate, startDate)
+			.le(ObjectUtils.isNotNull(endDate), Bills::getBillDate, endDate));
+
+		return null;
+	}
+
+	@Override
+	public R totalCargoVolume(String type, String startDate, String endDate) {
+		return null;
+	}
+
+	@Override
+	public R effectiveCorp(String type) {
+		return null;
+	}
+
+	@Override
+	public R lossCorp(String type) {
+		return null;
+	}
+}

blade-service/blade-sales-part/src/main/java/org/springblade/salesPart/corps/mapper/CorpsDescMapper.xml

@@ -28,6 +28,11 @@
         <result column="sales_company_id" property="salesCompanyId"/>
         <result column="sales_company_name" property="salesCompanyName"/>
         <result column="use_credit_limit" property="useCreditLimit"/>
+        <result column="brand_id" property="brandId"/>
+        <result column="brand_name" property="brandName"/>
+        <result column="file_path" property="filePath"/>
+        <result column="longitude" property="longitude"/>
+        <result column="dimension" property="dimension"/>
     </resultMap>
     <update id="updateByIdPointsBalance" parameterType="org.springblade.salesPart.entity.PjCorpsDesc">
         update pjpf_corps_desc