Merge remote-tracking branch 'origin/master'

jd-logistics-common/ruoyi-common-core/pom.xml

@@ -83,6 +83,8 @@
             <artifactId>jaxb-api</artifactId>
         </dependency>
 
+
+
         <!-- Apache Lang3 -->
         <dependency>
             <groupId>org.apache.commons</groupId>
@@ -140,6 +142,7 @@
             <artifactId>ECAP</artifactId>
             <version>6.9</version>
         </dependency>
+
     </dependencies>
 
 </project>

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/annotation/Dict.java

@@ -0,0 +1,13 @@
+package com.ruoyi.logistics.annotation;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target(ElementType.FIELD) // 仅作用于字段
+@Retention(RetentionPolicy.RUNTIME) // 运行时可反射获取
+public @interface Dict {
+    // 仅需配置字典类型（如：sys_user_sex、order_status）
+    String value();
+}

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/annotation/SimpleDictExportUtil.java

@@ -0,0 +1,65 @@
+package com.ruoyi.logistics.annotation;
+
+import cn.hutool.core.util.ReflectUtil;
+import com.ruoyi.system.service.ISysDictTypeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+import org.springframework.util.ObjectUtils;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+/**
+ * 极简版字典映射工具
+ * 仅处理导出DTO的字典注解字段
+ */
+@Component // 必须加！让Spring扫描并创建实例，@Autowired才会生效
+public class SimpleDictExportUtil {
+
+  /*  // 1. 非静态变量（静态变量无法直接@Autowired注入）
+    private final RemoteDictService dictFeignClient;
+
+    // 2. 构造器注入（推荐，比@Autowired字段注入更稳定）
+    @Autowired
+    public SimpleDictExportUtil(RemoteDictService dictFeignClient) {
+        this.dictFeignClient = dictFeignClient;
+    }*/
+
+    @Autowired
+    private ISysDictTypeService dictTypeService;
+
+
+    /**
+     * 处理单个对象的字典映射（非静态方法，通过Spring容器调用）
+     */
+    public void handleDict(Object obj) {
+        if (obj == null) return;
+        Field[] fields = ReflectUtil.getFields(obj.getClass());
+        for (Field field : fields) {
+            if (field.isAnnotationPresent(Dict.class)) {
+                Dict dictAnno = field.getAnnotation(Dict.class);
+                String dictType = dictAnno.value();
+
+                try {
+                    field.setAccessible(true);
+                    String dictCode = (String) field.get(obj);
+                    if (ObjectUtils.isEmpty(dictCode)) continue;
+
+                    // 调用Feign客户端获取字典名称（核心）
+                    String dictName = dictTypeService.getDictLabel(dictType, dictCode);
+                    field.set(obj, dictName);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
+
+    /**
+     * 批量处理列表（非静态方法）
+     */
+    public void handleDictList(List<?> list) {
+        if (list == null || list.isEmpty()) return;
+        list.forEach(this::handleDict);
+    }
+}

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/BizFinancialAdjustmentRecordController.java

@@ -2,7 +2,10 @@ package com.ruoyi.logistics.controller;
 
 import java.util.List;
 import java.io.IOException;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.logistics.annotation.SimpleDictExportUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -34,7 +37,8 @@ public class BizFinancialAdjustmentRecordController extends BaseController
 {
     @Autowired
     private IBizFinancialAdjustmentRecordService bizFinancialAdjustmentRecordService;
-
+    @Resource
+    SimpleDictExportUtil simpleDictExportUtil;
     /**
      * 查询调账流水记录列表
      */
@@ -56,6 +60,8 @@ public class BizFinancialAdjustmentRecordController extends BaseController
     public void export(HttpServletResponse response, BizFinancialAdjustmentRecord bizFinancialAdjustmentRecord)
     {
         List<BizFinancialAdjustmentRecord> list = bizFinancialAdjustmentRecordService.selectBizFinancialAdjustmentRecordList(bizFinancialAdjustmentRecord);
+        simpleDictExportUtil.handleDictList(list);
+
         ExcelUtil<BizFinancialAdjustmentRecord> util = new ExcelUtil<BizFinancialAdjustmentRecord>(BizFinancialAdjustmentRecord.class);
         util.exportExcel(response, list, "调账流水记录数据");
     }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/BizInvoiceController.java

@@ -54,6 +54,6 @@ public class BizInvoiceController {
     @PostMapping("/selectInvoice")
     public AjaxResult selectInvoice(@RequestBody Map param) throws JsonProcessingException {
         Map result=invoiceService.selectInvoice(param);
-        return  null;
+        return  AjaxResult.success(result);
     }
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/BizWaybillCostDetailsController.java

@@ -1,7 +1,10 @@
 package com.ruoyi.logistics.controller;
 
 import java.util.List;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.logistics.annotation.SimpleDictExportUtil;
 import com.ruoyi.logistics.domain.RptFinancialMonthSummary;
 import com.ruoyi.logistics.service.IRptFinancialMonthSummaryService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -40,6 +43,22 @@ public class BizWaybillCostDetailsController extends BaseController
 
 
 
+    //运单中的费用明细
+    @GetMapping("/detaillist")
+    public TableDataInfo detaillist(BizWaybillCostDetails bizWaybillCostDetails)
+    {
+        startPage();
+        List<BizWaybillCostDetails> list = bizWaybillCostDetailsService.detaillist(bizWaybillCostDetails);
+        return getDataTable(list);
+    }
+
+
+
+
+
+
+
+
     /**
      * 查询运单明细列表
      * 这个在财务月度汇总需传入供应商id以及外部运单号  查询详情列表

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/controller/RptFinancialMonthSummaryController.java

@@ -3,7 +3,10 @@ package com.ruoyi.logistics.controller;
 import java.util.List;
 import java.io.IOException;
 import java.util.Map;
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletResponse;
+
+import com.ruoyi.logistics.annotation.SimpleDictExportUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -35,7 +38,8 @@ public class RptFinancialMonthSummaryController extends BaseController
 {
     @Autowired
     private IRptFinancialMonthSummaryService rptFinancialMonthSummaryService;
-
+    @Resource
+    SimpleDictExportUtil simpleDictExportUtil;
     /**
      * 查询财务月度汇总列表
      */
@@ -57,6 +61,7 @@ public class RptFinancialMonthSummaryController extends BaseController
     public void export(HttpServletResponse response, RptFinancialMonthSummary rptFinancialMonthSummary)
     {
         List<RptFinancialMonthSummary> list = rptFinancialMonthSummaryService.selectRptFinancialMonthSummaryList(rptFinancialMonthSummary);
+        simpleDictExportUtil.handleDictList(list);
         ExcelUtil<RptFinancialMonthSummary> util = new ExcelUtil<RptFinancialMonthSummary>(RptFinancialMonthSummary.class);
         util.exportExcel(response, list, "财务月度汇总数据");
     }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/domain/BizFinancialAdjustmentRecord.java

@@ -1,5 +1,6 @@
 package com.ruoyi.logistics.domain;
 
+import com.ruoyi.logistics.annotation.Dict;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -32,6 +33,7 @@ public class BizFinancialAdjustmentRecord extends BaseEntity
 
     /** 调账类型 */
     @Excel(name = "调账类型")
+    @Dict("adjustment_type")
     private String adjustmentType;
 
     /** 原金额 */

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/domain/RptFinancialMonthSummary.java

@@ -1,5 +1,6 @@
 package com.ruoyi.logistics.domain;
 
+import com.ruoyi.logistics.annotation.Dict;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
@@ -33,7 +34,8 @@ public class RptFinancialMonthSummary extends BaseEntity
     private String transactionCount;
 
     /** 账单状态 1.待对账 2.已对账 3.待开票 4.已开票 */
-    @Excel(name = "账单状态", readConverterExp = "1=待对账,2=已对账(待开票),3=已开票")
+    @Excel(name = "账单状态")
+    @Dict("monthly_report_status")
     private String status;
 
     /** 删除标志 */

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/mapper/BizWaybillCostDetailsMapper.java

@@ -62,4 +62,6 @@ public interface BizWaybillCostDetailsMapper
     List<BizWaybillCostDetails> selectBizWaybillCostDetailsListByWx(BizWaybillCostDetails bizWaybillCostDetails);
 
     BizWaybillCostDetails getAccountAdjustmentById(BizWaybillCostDetails bizWaybillCostDetails);
+
+    List<BizWaybillCostDetails> detaillist(BizWaybillCostDetails bizWaybillCostDetails);
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/IBizWaybillCostDetailsService.java

@@ -69,4 +69,6 @@ public interface IBizWaybillCostDetailsService
     int accountAdjustment(BizWaybillCostDetails bizWaybillCostDetails);
 
     BizWaybillCostDetails getAccountAdjustmentById(BizWaybillCostDetails bizWaybillCostDetails);
+
+    List<BizWaybillCostDetails> detaillist(BizWaybillCostDetails bizWaybillCostDetails);
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/BizWaybillCostDetailsServiceImpl.java

@@ -171,4 +171,10 @@ catch(Exception e)
     public BizWaybillCostDetails getAccountAdjustmentById(BizWaybillCostDetails bizWaybillCostDetails) {
         return bizWaybillCostDetailsMapper.getAccountAdjustmentById(bizWaybillCostDetails);
     }
+
+    @Override
+    public List<BizWaybillCostDetails> detaillist(BizWaybillCostDetails bizWaybillCostDetails) {
+        return bizWaybillCostDetailsMapper.detaillist(bizWaybillCostDetails);
+
+    }
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/FeePushService.java

@@ -5,6 +5,8 @@ import com.ruoyi.logistics.domain.*;
 import com.ruoyi.logistics.service.IBizFinancialFeeItemsService;
 import com.ruoyi.logistics.service.IBizWaybillCostDetailsService;
 import com.ruoyi.logistics.service.IBizWaybillOrderService;
+import com.ruoyi.system.api.domain.SysDept;
+import com.ruoyi.system.service.ISysDeptService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.slf4j.Logger;
@@ -23,7 +25,8 @@ import java.util.List;
 @Service
 public class FeePushService {
     private static final Logger logger = LoggerFactory.getLogger(FeePushService.class);
-
+    @Autowired
+    private ISysDeptService sysDeptService;
     @Autowired
     private IBizWaybillOrderService bizWaybillOrderService;
     @Autowired
@@ -57,8 +60,11 @@ public class FeePushService {
             Long deptId=orderList.get(0).getDeptId();
             Long userId=orderList.get(0).getUserId();
             Long waybillId=orderList.get(0).getWaybillId();
+
+            SysDept sysDept = sysDeptService.selectDeptById(orderList.get(0).getDeptId());
+
             // TODO:先写死  这里差一个查询供应商费率的查询
-            String  Rate="1.5";
+            String  Rate=sysDept.getRateValue();
             /*处理费用明细*/
             if (feeList != null && !feeList.isEmpty()) {
                 for (SfFeeInfo fee : feeList) {

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/service/impl/InvoiceServiceImpl.java

@@ -2,6 +2,7 @@ package com.ruoyi.logistics.service.impl;
 import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.redis.service.RedisIdGenerator;
 import com.ruoyi.logistics.config.InvoiceConfig;
 import com.ruoyi.logistics.domain.InvoiceRequest;
@@ -56,8 +57,8 @@ public class InvoiceServiceImpl implements InvoiceService {
         content.put("zsfs", "0");                              // 征收方式：0=普通征税
         content.put("khmc", invoiceRequest.getKhmc());         // 购货单位名称
         content.put("hsje", invoiceRequest.getHsje());                           // 含税金额（价税合计）
-        content.put("gsdm", "7600");                           // 公司代码
-        content.put("yhdm", "ec014266e63344698642d6e5c5b8b556"); // 用户代码
+        content.put("gsdm", "3204");                           // 公司代码
+        content.put("yhdm", "393e8941f3f1409e8cbc7fc981ca1774"); // 用户代码
         content.put("sjlx", "1"); // 数据类型（批发系统，由平台提供）
         content.put("sfwzzfp", "N"); // 非纸质发票（默认N）
         content.put("hsbz", "1"); // 含税标志（1=含税，默认）
@@ -72,14 +73,14 @@ public class InvoiceServiceImpl implements InvoiceService {
         JSONObject goodsItem = new JSONObject();
         goodsItem.put("djhh", "1"); // 单据行号
         goodsItem.put("fphxz", "0"); // 发票行性质：0=正常行
-        goodsItem.put("spmc", "测试商品"); // 商品名称
+        goodsItem.put("spmc", "*经纪代理服务*物流辅助服务代理服务费"); // 商品名称
         goodsItem.put("jldw", "月"); //计量单位
         goodsItem.put("spsl", 1.00); // 商品数量
         goodsItem.put("ssbm", "3040802010100000000"); // 19位税收编码
         goodsItem.put("hsdj", invoiceRequest.getHsje()); // 含税单价
         goodsItem.put("hsje", invoiceRequest.getHsje()); // 商品含税金额
         BigDecimal[] result =TaxAmountCalculator.calculateFromTaxIncluded(invoiceRequest.getHsje(), BigDecimal.valueOf(0.06));
-        goodsItem.put("tax", 0.06); // 税率13%
+        goodsItem.put("tax", 0.06); // 税率6%
         goodsItem.put("se", result[1]); // 商品税额
         content.put("mxxx", new JSONObject[]{goodsItem});
         logger.info("开票参数组装完成  参数{}",content);
@@ -104,6 +105,9 @@ public class InvoiceServiceImpl implements InvoiceService {
                 responseJson,
                 new TypeReference<Map<String, Object>>() {}
         );
+
+        //这里成功后也要将单据编号进行回传月度报表
+
         return invoiceMap;
     }
 
@@ -117,28 +121,41 @@ public class InvoiceServiceImpl implements InvoiceService {
 
     @Override
     public Map selectInvoice(Map param) throws JsonProcessingException {
-        // 1. 组装正票申请的业务报文（content）
+        // 1.组装查询的报文
         JSONObject content = new JSONObject();
-        content.put("djbh",param.get("djbh"));
+        content.put("djbh",param.get("djbh").toString());
         String contentBase64 = Base64Util.encode(content.toJSONString());
+        // 3. 构建签名参数，生成签名值
         Map<String, String> signParams = new HashMap<>();
         signParams.put("appid", invoiceConfig.getAppId());
         signParams.put("serviceid", invoiceConfig.getServiceSelect());
         signParams.put("content", contentBase64);
-        String signature = SignUtil.sign(invoiceConfig.getSignType(), invoiceConfig.getAppSecret(), signParams);
+        String signature = SignUtil.sign("3", invoiceConfig.getAppSecret(), signParams);
+
         JSONObject requestParam = new JSONObject();
         requestParam.put("appid", invoiceConfig.getAppId());
         requestParam.put("serviceid", invoiceConfig.getServiceSelect());
         requestParam.put("content", contentBase64);
         requestParam.put("signature", signature);
-        requestParam.put("signType", invoiceConfig.getSignType());
+        requestParam.put("signType","3");
         String responseJson = HttpUtil.doPostJson(invoiceConfig.getBaseUrl(), requestParam.toJSONString());
         ObjectMapper objectMapper = new ObjectMapper();
-        // JsonNode jsonNode = objectMapper.readTree(responseJson);
         Map<String, Object> invoiceMap = objectMapper.readValue(
                 responseJson,
                 new TypeReference<Map<String, Object>>() {}
         );
+        if(StringUtils.isNotBlank(invoiceMap.get("data").toString())){
+
+
+            Map<String, Object> dataMap = objectMapper.readValue(
+                    Base64Util.decode(invoiceMap.get("data").toString()),
+                    new TypeReference<Map<String, Object>>() {}
+            );
+            invoiceMap.put("data",dataMap);
+        }
+       //这里  需要将查询到的信息进行回写月度报表里面
+
+
         return invoiceMap;
     }
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/logistics/util/SignUtil.java

@@ -74,9 +74,6 @@ public class SignUtil {
             sb.append(SPE5);
             sb.append(sbParam);
         }
-        System.out.println(">>>>>>>>>>>>>>>>>>>>");
-        System.out.println(sb.toString());
-        System.out.println(">>>>>>>>>>>>>>>>>>>>");
         return sb.toString();
     }
     private static String buildResource2(Map<String, String> querys) {

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/controller/SysDictTypeController.java

@@ -1,8 +1,10 @@
 package com.ruoyi.system.controller;
 
 import java.util.List;
+import java.util.Map;
 import javax.servlet.http.HttpServletResponse;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -35,6 +37,7 @@ public class SysDictTypeController extends BaseController
     @Autowired
     private ISysDictTypeService dictTypeService;
 
+
     @RequiresPermissions("system:dict:list")
     @GetMapping("/list")
     public TableDataInfo list(SysDictType dictType)
@@ -129,4 +132,13 @@ public class SysDictTypeController extends BaseController
         List<SysDictType> dictTypes = dictTypeService.selectDictTypeAll();
         return success(dictTypes);
     }
+
+
+    @GetMapping("/getDictLabel")
+    public String  getDictLabel(String dictType, String dictCode)
+    {
+      return dictTypeService.getDictLabel(dictType,dictCode);
+    }
+
+
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java

@@ -95,4 +95,6 @@ public interface ISysDictTypeService
      * @return 结果
      */
     public boolean checkDictTypeUnique(SysDictType dictType);
+
+    String getDictLabel(String dictType, String dictCode);
 }

jd-logistics-modules/jd-logistics-system/src/main/java/com/ruoyi/system/service/impl/SysDictTypeServiceImpl.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import com.ruoyi.common.core.constant.UserConstants;
@@ -220,4 +221,13 @@ public class SysDictTypeServiceImpl implements ISysDictTypeService
         }
         return UserConstants.UNIQUE;
     }
+
+
+    @Autowired
+    JdbcTemplate jdbcTemplate;
+    @Override
+    public String getDictLabel(String dictType, String dictCode) {
+        List<Map<String,Object>>  dictList=jdbcTemplate.queryForList(" select dict_label from sys_dict_data  where dict_type=? and dict_value=?",dictType,dictCode);
+        return dictList.get(0).get("dict_label").toString();
+    }
 }

jd-logistics-modules/jd-logistics-system/src/main/resources/mapper/logistics/BizWaybillCostDetailsMapper.xml

@@ -74,9 +74,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="summaryMonth != null "> AND DATE_FORMAT( b.sign_time, '%Y.%m' ) = #{summaryMonth}</if>
             <if test="deptId != null "> AND a.dept_id = #{deptId}</if>
             <if test="externalWaybillNo != null  and externalWaybillNo != ''"> and a.external_waybill_no = #{externalWaybillNo}</if>
-
-   <!--         &lt;!&ndash; 数据范围过滤 &ndash;&gt;
-            ${params.dataScope}-->
+            ${params.dataScope}
 
            <!-- <if test="waybillId != null "> and waybill_id = #{waybillId}</if>
 
@@ -92,6 +90,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
 
+    <select id="detaillist" parameterType="com.ruoyi.logistics.domain.BizWaybillCostDetails" resultMap="BizWaybillCostDetailsResult">
+        <include refid="selectBizWaybillCostDetailsVo"/>
+        <where>
+
+            <if test="waybillId != null "> and a.waybill_id = #{waybillId}</if>
+
+        </where>
+    </select>
 
     <select id="selectBizWaybillCostDetailsListByWx" parameterType="com.ruoyi.logistics.domain.BizWaybillCostDetails" resultMap="BizWaybillCostDetailsResult">
         select waybill_detail_id, waybill_id, external_waybill_no, fee_item_code, fee_item_name, fee_name, amount, rate_amount, adjust_amount, remark, create_time, update_time, dept_id, user_id, del_flag, create_by, update_by from biz_waybill_cost_details

jd-logistics-ui-v3/src/api/logistics/order.js

@@ -67,7 +67,7 @@ export function deliverTrace(data) {
 // 查询物流费用
 export function deliverFree(data) {
   return request({
-    url: '/system/costDetails/list',
+    url: '/system/costDetails/detaillist',
     method: 'get',
     params: data
   })