Ver Fonte

新增特殊商品退货提示

JiangChongBo há 2 anos atrás
pai
commit
1145c18b7c

+ 3 - 0
src/main/java/com/caimei365/order/mapper/OrderCommonMapper.java

@@ -175,5 +175,8 @@ public interface OrderCommonMapper {
     Integer findPayB2BRecord(Integer shopOrderId);
 
     Integer findMaxStock(Integer productId);
+
+    String getHelpContent(Integer helpId);
+
 }
 

+ 9 - 0
src/main/java/com/caimei365/order/model/vo/CartItemVo.java

@@ -171,4 +171,13 @@ public class CartItemVo implements Serializable {
      * 商品分账号
      */
     private String splitCode;
+
+    /**
+     * 能否退货  1 能 2不能
+     */
+    private Integer returnGoodsStutas;
+    /**
+     * 特殊商品退货须知提示  (取后台帮助中心id1040的数据)
+     */
+    private String  helpContent;
 }

+ 10 - 0
src/main/java/com/caimei365/order/model/vo/OrderProductVo.java

@@ -252,4 +252,14 @@ public class OrderProductVo implements Serializable {
      * 超级会员价格标签
      */
     private String svipPriceTag;
+
+    /**
+     * 能否退货  1 能 2不能
+     */
+    private Integer returnGoodsStutas;
+
+    /**
+     * 特殊商品退货须知提示  (取后台帮助中心id1040的数据)
+     */
+    private String  helpContent;
 }

+ 6 - 0
src/main/java/com/caimei365/order/service/impl/CartClubServiceImpl.java

@@ -1603,6 +1603,12 @@ public class CartClubServiceImpl implements CartClubService {
         CartItemVo cartItemVo = cartClubMapper.getCartItemByProductId(cartDto.getSkuId());
         if (null == cartItemVo) {
             return ResponseJson.error("商品数据异常!", null);
+        }else{
+            //是否能退货
+            if(null!=cartItemVo.getReturnGoodsStutas()&&2==cartItemVo.getReturnGoodsStutas()){
+                String helpContent = orderCommonMapper.getHelpContent(1040);
+                cartItemVo.setHelpContent(helpContent);
+            }
         }
         // 用户身份
         Integer userIdentity = baseMapper.getIdentityByUserId(cartDto.getUserId());

+ 5 - 0
src/main/java/com/caimei365/order/service/impl/OrderClubServiceImpl.java

@@ -218,6 +218,11 @@ public class OrderClubServiceImpl implements OrderClubService {
                 if (recharge) {
                     order.setRechargeGoods(true);
                 }
+                //是否能退货
+                if(null!=orderProduct.getReturnGoodsStutas()&&2==orderProduct.getReturnGoodsStutas()){
+                    String helpContent = orderCommonMapper.getHelpContent(1040);
+                    orderProduct.setHelpContent(helpContent);
+                }
                 // 总税费
                 expensesOfTaxation.set(MathUtil.add(expensesOfTaxation.get(), orderProduct.getTotalAddedValueTax()).doubleValue());
                 //已发货数量

+ 2 - 1
src/main/resources/mapper/CartClubMapper.xml

@@ -314,7 +314,8 @@
                csp.priceType                as svipPriceType,
                csp.discount                 as svipDiscount,
                csp.discountPrice            as svipDiscountPrice,
-               p.productType
+               p.productType,
+               p.returnGoodsStutas
         FROM cm_sku cs
                  LEFT JOIN product p on p.productID = cs.productId
                  LEFT JOIN cm_svip_product csp ON p.productID = csp.productId

+ 6 - 1
src/main/resources/mapper/OrderCommonMapper.xml

@@ -113,7 +113,8 @@
                cop.svipDiscount,
                p.productCategory  as productCategory,
                p.productType,
-               p.productCode
+               p.productCode,
+               p.returnGoodsStutas
         FROM cm_order_product cop
                  LEFT JOIN product p ON cop.productID = p.productID
         WHERE cop.shopOrderID = #{shopOrderId}
@@ -741,4 +742,8 @@
         ORDER BY stock DESC
         LIMIT 1
     </select>
+
+    <select id="getHelpContent" resultType="java.lang.String">
+        select content from helppage where helpPageID=#{helpId}
+    </select>
 </mapper>