2024-05-16修改BUG

yudao-module-member/yudao-module-member-impl/src/main/java/cn/iocoder/yudao/module/member/vo/member/MemberBackVO.java

 package cn.iocoder.yudao.module.member.vo.member;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.*;
 import java.util.*;
 import io.swagger.annotations.*;
@@ -50,7 +51,9 @@ public class MemberBackVO {
     private String loginIp;
 
     @ExcelProperty("最后登录时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    //lanbm 2024-05-15 修改显示BUG
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "最后登录时间")
     private Date loginDate;
 
@@ -59,7 +62,9 @@ public class MemberBackVO {
     private String backLetterImg;
 
     @ExcelProperty("创建时间")
-    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    //lanbm 2024-05-15 修改显示BUG
+    //@DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    @JsonFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     @ApiModelProperty(value = "创建时间", required = true)
     private Date createTime;
 

yudao-module-order/yudao-module-order-core/src/main/java/cn/iocoder/yudao/module/order/service/order/impl/OrderFeeApplicationServiceImpl.java

@@ -259,7 +259,8 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateFeeApproveResult(String id, int result) {
-        OrderFeeApplicationDO orderFeeApplicationDO = feeApplicationMapper.selectById(id);
+        OrderFeeApplicationDO orderFeeApplicationDO =
+                feeApplicationMapper.selectById(id);
         if (orderFeeApplicationDO != null) {
             orderFeeApplicationDO.setStatus(result);
             feeApplicationMapper.updateById(orderFeeApplicationDO);
@@ -268,8 +269,22 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
                 OrderBackVO order = orderQueryService.getOrder(orderFeeApplicationDO.getOrderId());
                 //生成应收
                 DictDataRespDTO dictDto = DictFrameworkUtils.getDictDataFromCache("receivable_fee_type", String.valueOf(orderFeeApplicationDO.getFeeType()));
-                if (orderFeeApplicationDO.getReceivableId() != null && orderFeeApplicationDO.getReceivableId() > 0) {
+                //lanbm 2024-05-16 修复应收款记录不存在的BUG,
+                //添加应收款记录是否存在的判断
+                ReceivableDO rDo = null;
+                if (orderFeeApplicationDO.getReceivableId() != null &&
+                        orderFeeApplicationDO.getReceivableId() > 0) {
+                    long idTemp = (long) orderFeeApplicationDO.getReceivableId();
+                    rDo = receivableService.getReceivable(idTemp);
+                }
+                //end lanbm 2024-05-16 修复应收款记录不存在的BUG
+
+                if (orderFeeApplicationDO.getReceivableId() != null &&
+                        orderFeeApplicationDO.getReceivableId() > 0 &&
+                        rDo != null) {
                     ReceivableDO receivableDO = new ReceivableDO();
+                    //orderFeeApplicationDO 审批信息关联的应收款ID
+                    //lanbm 2024-05-15 添加的注释
                     receivableDO.setId(Long.valueOf(orderFeeApplicationDO.getReceivableId()));
                     receivableDO.setTitleZh(dictDto.getLabel());
                     receivableDO.setTitleEn(dictDto.getLabelEn());
@@ -286,9 +301,11 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
                     receivableDO.setFeeSource(2);
                     receivableDO.setAuthor(orderFeeApplicationDO.getApplicationAuthor());
                     receivableDO.setRemark(orderFeeApplicationDO.getRemarks());
+                    //应收款此处报应收款不存在的BUG
                     receivableService.updateReceivableById(receivableDO);
                 } else {
-                    ReceivableCreateReqVO receivableCreateReqVO = new ReceivableCreateReqVO();
+                    ReceivableCreateReqVO receivableCreateReqVO =
+                            new ReceivableCreateReqVO();
                     receivableCreateReqVO.setTitleZh(dictDto.getLabel());
                     receivableCreateReqVO.setTitleEn(dictDto.getLabelEn());
                     receivableCreateReqVO.setOrderId(orderFeeApplicationDO.getOrderId());
@@ -304,9 +321,12 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
                     receivableCreateReqVO.setFeeSource(2);
                     receivableCreateReqVO.setAuthor(orderFeeApplicationDO.getApplicationAuthor());
                     receivableCreateReqVO.setRemark(orderFeeApplicationDO.getRemarks());
+
                     Long receivableId = receivableService.createReceivable(receivableCreateReqVO);
+                    //把创建的应收款信息关联到审批主表中
                     orderFeeApplicationDO.setReceivableId(receivableId.intValue());
                 }
+
                 feeApplicationMapper.updateById(orderFeeApplicationDO);
                 FeeDto feeDto = new FeeDto();
                 feeDto.setFeeType(orderFeeApplicationDO.getFeeType());
@@ -328,6 +348,13 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
         }
     }
 
+    /*  lanbm 2024-05-11 添加注释
+    //result
+    1, "处理中",
+    2, "通过",
+    3, "不通过",
+    4, "取消"
+     */
     @Override
     @Transactional(rollbackFor = Exception.class)
     public void updateFeeApproveBatchResult(String id, int result) {
@@ -347,6 +374,7 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
                     DictDataRespDTO dictDto = DictFrameworkUtils.getDictDataFromCache("receivable_fee_type", String.valueOf(feeApplicationDO.getFeeType()));
                     if (feeApplicationDO.getReceivableId() != null && feeApplicationDO.getReceivableId() > 0) {
                         ReceivableDO receivableDO = new ReceivableDO();
+                        //应收款ID lanbm 2024-05-11 添加注释
                         receivableDO.setId(Long.valueOf(feeApplicationDO.getReceivableId()));
                         receivableDO.setTitleZh(dictDto.getLabel());
                         receivableDO.setTitleEn(dictDto.getLabelEn());
@@ -363,6 +391,8 @@ public class OrderFeeApplicationServiceImpl extends AbstractService<OrderFeeAppl
                         receivableDO.setFeeSource(2);
                         receivableDO.setAuthor(feeApplicationDO.getApplicationAuthor());
                         receivableDO.setRemark(feeApplicationDO.getRemarks());
+                        //lanbm 2024-05-11 添加注释，订单费用申请，是申请付给我们的费用，
+                        // 所以要更新应收款信息
                         receivableService.updateReceivableById(receivableDO);
                     } else {
                         ReceivableCreateReqVO receivableCreateReqVO = new ReceivableCreateReqVO();

yudao-module-shipment/yudao-module-shipment-core/src/main/java/cn/iocoder/yudao/module/shipment/service/box/BoxServiceImpl.java

@@ -957,9 +957,15 @@ public class BoxServiceImpl extends AbstractService<BoxMapper, BoxDO> implements
             }
 
             //到港
-            BoxArrivalAirDO boxArrivalAirDO = boxArrivalAirService.getOne(new LambdaQueryWrapper<BoxArrivalAirDO>()
-                    .eq(BoxArrivalAirDO::getShipmentId, id)
-            );
+            //lanbm 2024-05-15 修改有多条记录是报错的BUG
+            BoxArrivalAirDO boxArrivalAirDO =
+                    boxArrivalAirService.getOne(
+                            new LambdaQueryWrapper<BoxArrivalAirDO>()
+                                    .eq(BoxArrivalAirDO::getShipmentId, id)
+                                    .orderByDesc(BoxArrivalAirDO::getId)
+                                    .last("limit 1")
+                    );
+
             abnormalCount = abnormalList.stream()
                     .filter(t -> t.getOpStep().equals(AbnormalStepAirEnum.ARRIVAL.getStep()))
                     .count();