update:商品描述信息修正

fengliang
1 parent 5bf9a101
Showing 4 changed files with 57 additions and 21 deletions
etrade-order/src/main/java/com/diligrp/etrade/order/api/OrderController.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/OrderService.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderGoodsServiceImpl.java
etrade-order/src/main/java/com/diligrp/etrade/order/service/impl/OrderServiceImpl.java
@@ -775,7 +775,7 @@ public class OrderController {
     }
     /**
-     * 查询核销状态
+     * 订单手动通知微信商户平台发货
      * @param orderDto
      * @return
      */
@@ -789,6 +789,19 @@ public class OrderController {
         }
     }
-
+    /**
+     * 获取订单商品名称字符串
+     * @param orderDto
+     * @return
+     */
+    @RequestMapping(value = "/getOrderGoodesNames",method = {RequestMethod.POST},produces="application/json;charset=UTF-8")
+    public Message getOrderGoodesNames(@RequestBody   OrderGetDto orderDto){
+        try{
+            return Message.success(orderService.getOrderGoodesNames(orderDto));
+        }catch (PlatformServiceException pe) {
+            LOGGER.warn("服务异常{}:{}",pe.getCode(), pe.getMessage());
+            return Message.failure("服务暂时不在线，请稍后");
+        }
+    }
 }
@@ -263,4 +263,11 @@ public interface OrderService {
      * 获取订单状态
      */
     OrderDto checkOrderState(String code);
+
+    /**
+     * 获取订单列表商品名称
+     * @param orderDto
+     * @return
+     */
+    String getOrderGoodesNames(OrderGetDto orderDto);
 }
@@ -350,29 +350,37 @@ public class OrderGoodsServiceImpl implements OrderGoodsService {
     @Override
     public String getGoodsNames(String name, List<Order> orderList) {
-        List<Long> orderId = orderList.stream().map(Order::getId).collect(Collectors.toList());
-        List<ProductDto> goodsNames = orderGoodsMapper.getOrderGoodsByOrderIds(orderId);
-        StringBuffer nameBuffer = new StringBuffer();
-        nameBuffer.append(name);
-        boolean first = false;
-        for(ProductDto goods : goodsNames){
-            if(nameBuffer.length()>110){
-                break;
-            }
-            if(first){
-                nameBuffer.append(",");
-            }else{
-                nameBuffer.append(":");
-                first = true;
+        if (orderList == null || orderList.isEmpty()) {
+            return name;
+        }
+
+        List<Long> orderIds = orderList.stream().map(Order::getId).collect(Collectors.toList());
+        List<ProductDto> goodsNames = orderGoodsMapper.getOrderGoodsByOrderIds(orderIds);
+
+        StringBuilder nameBuilder = new StringBuilder(name);
+        boolean isFirst = true;
+
+        for (ProductDto goods : goodsNames) {
+            StringBuilder goodsInfo = new StringBuilder();
+            if (!isFirst) {
+                goodsInfo.append(",");
+            } else {
+                goodsInfo.append(":");
+                isFirst = false;
             }
-            String goodsInfo = goods.getProductName()+goods.getProductWeight().stripTrailingZeros()+goods.getProductUnit();
-            if(nameBuffer.length()+goodsInfo.length() >110){
+
+            String productWeightStr = goods.getProductWeight().stripTrailingZeros().toPlainString();
+            String productUnit = goods.getProductUnit() != null ? goods.getProductUnit() : "";
+            goodsInfo.append(goods.getProductName()).append(productWeightStr).append(productUnit);
+
+            if (nameBuilder.length() + goodsInfo.length() > 110) {
+                nameBuilder.append(",等多种商品");
                 break;
-            }else{
-                nameBuffer.append(goodsInfo);
+            } else {
+                nameBuilder.append(goodsInfo);
             }
         }
-        return nameBuffer.toString();
+        return nameBuilder.toString();
     }
     private void checkShopCustomer(ShopVo shop) {
@@ -1050,6 +1050,14 @@ public class OrderServiceImpl implements OrderService {
     }
     @Override
+    public String getOrderGoodesNames(OrderGetDto orderDto) {
+        Order order = getOneOrder(orderDto);
+        List<Order> orderList = new ArrayList<>();
+        orderList.add(order);
+        return orderGoodsService.getGoodsNames(order.getShopName(),orderList);
+    }
+
+    @Override
     public Integer checkPayStateOnLine(String paymentId, Long marketId) {
         WeChatPayFunctionDto functionDto = new WeChatPayFunctionDto(paymentId,"online",marketId);
         OrderPaymentCheckDto orderPaymentCheckDto = this.wxChatPayCheck(functionDto);