Browse Source

增加特殊商品退货提示功能开发

JiangChongBo 2 years ago
parent
commit
e111728bac

+ 3 - 0
src/main/java/com/caimei/mapper/OrderMapper.java

@@ -296,4 +296,7 @@ public interface OrderMapper {
     ShopOrderVo getShopOrderByOrderId(Integer shopOrderId);
     ShopOrderVo getShopOrderByOrderId(Integer shopOrderId);
 
 
     List<DiscernReceiptVo> getShopOrderDiscernReceipt(Integer shopOrderId);
     List<DiscernReceiptVo> getShopOrderDiscernReceipt(Integer shopOrderId);
+
+    String getHelpContent(Integer helpId);
+
 }
 }

+ 3 - 0
src/main/java/com/caimei/mapper/OrderSubmitMapper.java

@@ -184,4 +184,7 @@ public interface OrderSubmitMapper {
      */
      */
     void updateReductionUserId(@Param("reductionUserId") Integer reductionUserId,@Param("orderId") Long orderId);
     void updateReductionUserId(@Param("reductionUserId") Integer reductionUserId,@Param("orderId") Long orderId);
 
 
+    String getHelpContent(Integer helpId);
+
+
 }
 }

+ 9 - 0
src/main/java/com/caimei/model/vo/OrderProductVo.java

@@ -261,4 +261,13 @@ public class OrderProductVo implements Serializable {
     private Integer collagePriceFlag;
     private Integer collagePriceFlag;
 
 
     private static final long serialVersionUID = 1L;
     private static final long serialVersionUID = 1L;
+
+    /**
+     * 能否退货  1 能 2不能
+     */
+    private Integer returnGoodsStutas;
+    /**
+     * 特殊商品退货须知提示  (取后台帮助中心id1040的数据)
+     */
+    private String  helpContent;
 }
 }

+ 8 - 0
src/main/java/com/caimei/model/vo/ShopVo.java

@@ -54,4 +54,12 @@ public class ShopVo implements Serializable {
      */
      */
     @ApiModelProperty("供应商下商品信息")
     @ApiModelProperty("供应商下商品信息")
     private List<CartProductVo> productList;
     private List<CartProductVo> productList;
+    /**
+     * 能否退货  1 能 2不能
+     */
+    private Integer returnGoodsStutas;
+    /**
+     * 特殊商品退货须知提示  (取后台帮助中心id1040的数据)
+     */
+    private String  helpContent;
 }
 }

+ 14 - 0
src/main/java/com/caimei/service/impl/OrderServiceImpl.java

@@ -104,9 +104,16 @@ public class OrderServiceImpl implements OrderService {
         BigDecimal expensesOfTaxation = new BigDecimal(0);
         BigDecimal expensesOfTaxation = new BigDecimal(0);
         int returnedNumTotal = 0;
         int returnedNumTotal = 0;
         int actualCancelNumTotal = 0;
         int actualCancelNumTotal = 0;
+        String helpContent=null;
+        boolean flag=false;
         for (ShopOrderVo shopOrder : shopOrderList) {
         for (ShopOrderVo shopOrder : shopOrderList) {
             List<OrderProductVo> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderId());
             List<OrderProductVo> orderProductList = orderMapper.findOrderProduct(shopOrder.getShopOrderId());
             for (OrderProductVo orderProduct : orderProductList) {
             for (OrderProductVo orderProduct : orderProductList) {
+                //订单中存在不能退货的商品则给出不能退货提示
+                if(null!=orderProduct.getReturnGoodsStutas()&&orderProduct.getReturnGoodsStutas()==2){
+                    flag=true;
+                    helpContent = orderMapper.getHelpContent(1040);
+                }
                 //运费
                 //运费
                 if (shopOrder.getShopId() == 998) {
                 if (shopOrder.getShopId() == 998) {
                     order.setFreight(orderProduct.getPrice());
                     order.setFreight(orderProduct.getPrice());
@@ -163,6 +170,13 @@ public class OrderServiceImpl implements OrderService {
         map.put("userInfo", userInfo);
         map.put("userInfo", userInfo);
         map.put("shopOrderList", shopOrderList);
         map.put("shopOrderList", shopOrderList);
         map.put("discernReceiptList", discernReceiptList);
         map.put("discernReceiptList", discernReceiptList);
+        if(flag){
+            map.put("returnGoodsStutas", 2);
+            map.put("helpContent", helpContent);
+        }else{
+            map.put("returnGoodsStutas", 1);
+            map.put("helpContent", null);
+        }
         return ResponseJson.success(map);
         return ResponseJson.success(map);
     }
     }
 
 

+ 17 - 0
src/main/java/com/caimei/service/impl/OrderSubmitServiceImpl.java

@@ -78,6 +78,23 @@ public class OrderSubmitServiceImpl implements OrderSubmitService {
                 }
                 }
             }
             }
         }
         }
+        String helpContent=null;
+        boolean flag=false;
+        for (int i=0;i<shopList.size();i++) {
+            //订单中存在不能退货的商品则给出不能退货提示
+            if(null!=shopList.get(i).getReturnGoodsStutas()&&shopList.get(i).getReturnGoodsStutas()==2){
+                flag=true;
+                helpContent = orderSubmitMapper.getHelpContent(1040);
+                break;
+            }
+        }
+        if(flag){
+            confirmData.put("returnGoodsStutas", 2);
+            confirmData.put("helpContent", helpContent);
+        }else{
+            confirmData.put("returnGoodsStutas", 1);
+            confirmData.put("helpContent", null);
+        }
         shopList.forEach(shop -> {
         shopList.forEach(shop -> {
             shop.setLogo(ProductUtils.getImageURL("shopLogo", shop.getLogo(), 0, domain));
             shop.setLogo(ProductUtils.getImageURL("shopLogo", shop.getLogo(), 0, domain));
             List<CartProductVo> shopProducts = new ArrayList<>();
             List<CartProductVo> shopProducts = new ArrayList<>();

+ 6 - 0
src/main/resources/mapper/OrderMapper.xml

@@ -149,9 +149,11 @@
           cop.productType,
           cop.productType,
           cop.ladderPriceFlag,
           cop.ladderPriceFlag,
           cop.heUserId,
           cop.heUserId,
+          p.returnGoodsStutas,
           cop.isActProduct as actProduct
           cop.isActProduct as actProduct
         FROM
         FROM
           cm_order_product cop
           cm_order_product cop
+          left join product p on  cop.productID=p.productID
         WHERE
         WHERE
           cop.shopOrderID = #{shopOrderId}
           cop.shopOrderID = #{shopOrderId}
     </select>
     </select>
@@ -626,4 +628,8 @@
           AND cror.delFlag = '0' AND cdr.delFlag = '0' AND cdr.receiptStatus = '3' AND cdr.payType != '16' AND cdr.receiptStatus IN(2,3)
           AND cror.delFlag = '0' AND cdr.delFlag = '0' AND cdr.receiptStatus = '3' AND cdr.payType != '16' AND cdr.receiptStatus IN(2,3)
         ORDER BY cdr.receiptDate DESC
         ORDER BY cdr.receiptDate DESC
     </select>
     </select>
+
+    <select id="getHelpContent" resultType="java.lang.String">
+        select content from helppage where helpPageID=#{helpId}
+    </select>
 </mapper>
 </mapper>

+ 5 - 0
src/main/resources/mapper/OrderSubmitMapper.xml

@@ -8,6 +8,7 @@
         s.shopID AS shopId,
         s.shopID AS shopId,
         s.name,
         s.name,
         s.logo,
         s.logo,
+        p.returnGoodsStutas,
         p.splitCode
         p.splitCode
         FROM
         FROM
         cm_cart cc
         cm_cart cc
@@ -1580,6 +1581,7 @@
         SELECT s.shopID AS shopId,
         SELECT s.shopID AS shopId,
                s.name,
                s.name,
                s.logo,
                s.logo,
+               p.returnGoodsStutas,
                p.splitCode
                p.splitCode
         FROM cm_hehe_product chp
         FROM cm_hehe_product chp
                  LEFT JOIN product p ON chp.productId = p.productID
                  LEFT JOIN product p ON chp.productId = p.productID
@@ -1649,4 +1651,7 @@
         where chru.id = #{reductionUserId}
         where chru.id = #{reductionUserId}
           and chru.orderId is null
           and chru.orderId is null
     </select>
     </select>
+    <select id="getHelpContent" resultType="java.lang.String">
+        select content from helppage where helpPageID=#{helpId}
+    </select>
 </mapper>
 </mapper>