Merge branch 'dev/2024/0611/update-business-Y' of feifan/mall-backend-business into master

修改发货

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/admin/order/TradeOrderDetailController.java

@@ -6,11 +6,14 @@ import cn.newfeifan.mall.module.member.api.user.dto.MemberUserRespDTO;
 //import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
 import cn.newfeifan.mall.module.pay.dal.dataobject.order.PayOrderDO;
 import cn.newfeifan.mall.module.pay.service.order.PayOrderService;
+import cn.newfeifan.mall.module.product.dal.dataobject.sku.ProductSkuDO;
+import cn.newfeifan.mall.module.product.service.sku.ProductSkuService;
 import cn.newfeifan.mall.module.trade.controller.admin.aftersale.vo.AfterSaleBaseVO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.*;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.detailvo.TradeOrderDeliveryVO;
 import cn.newfeifan.mall.module.trade.controller.admin.order.vo.detailvo.TradeOrderPayVo;
 import cn.newfeifan.mall.module.trade.controller.app.order.vo.AppTradeOrderDetailRespVO;
+import cn.newfeifan.mall.module.trade.controller.app.order.vo.item.AppTradeOrderItemRespVO;
 import cn.newfeifan.mall.module.trade.convert.aftersale.AfterSaleConvert;
 import cn.newfeifan.mall.module.trade.convert.order.TradeOrderConvert;
 import cn.newfeifan.mall.module.trade.dal.dataobject.aftersale.AfterSaleDO;
@@ -63,6 +66,9 @@ public class TradeOrderDetailController {
     @Resource
     private AfterSaleService afterSaleService;
 
+    @Resource
+    private ProductSkuService productSkuService;
+
     @Resource
     private DeliveryExpressService deliveryExpressService;
 
@@ -183,7 +189,12 @@ public class TradeOrderDetailController {
         DeliveryExpressDO express = order.getLogisticsId() != null && order.getLogisticsId() > 0 ?
                 deliveryExpressService.getDeliveryExpress(order.getLogisticsId()) : null;
         // 最终组合
-        return success(TradeOrderConvert.INSTANCE.convert02(order, orderItems, tradeOrderProperties, express));
+        AppTradeOrderDetailRespVO respVO = TradeOrderConvert.INSTANCE.convert02(order, orderItems, tradeOrderProperties, express);
+        for (AppTradeOrderItemRespVO item : respVO.getItems()) {
+            ProductSkuDO sku = productSkuService.getSku(item.getSkuId());
+            item.setHighPrecisionPrice(sku.getHighPrecisionPrice());
+        }
+        return success(respVO);
     }
 
 

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/controller/app/order/vo/item/AppTradeOrderItemRespVO.java

@@ -5,6 +5,7 @@ import cn.newfeifan.mall.module.trade.dal.dataobject.order.TradeOrderItemDO;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Schema(description = "用户 App - 订单交易项 Response VO")
@@ -59,4 +60,6 @@ public class AppTradeOrderItemRespVO {
     @Schema(description = "售后状态", requiredMode = Schema.RequiredMode.REQUIRED, example = "1")
     private Integer afterSaleStatus;
 
+    @Schema(description = "商品精度金额")
+    private BigDecimal highPrecisionPrice;
 }

feifan-module-mall/feifan-module-trade-biz/src/main/java/cn/newfeifan/mall/module/trade/service/order/TradeOrderUpdateServiceImpl.java

@@ -412,7 +412,7 @@ public class TradeOrderUpdateServiceImpl implements TradeOrderUpdateService {
         //5.发送微信模板消息
         List<String> params = new ArrayList<>();
         params.add(order.getNo());
-        if (deliveryReqVO.getDeliveryRemark() != null) {
+        if (deliveryReqVO.getAttachment() != null) {
             params.add("无");
             params.add("-");
         }else{