修改购物车猜你喜欢查询sql

kmall-api/src/main/java/com/kmall/api/api/ApiFootprintController.java

@@ -3,8 +3,12 @@ package com.kmall.api.api;
 import com.google.common.collect.Maps;
 import com.kmall.api.annotation.LoginUser;
 import com.kmall.api.entity.FootprintVo;
+import com.kmall.api.entity.StoreVo;
+import com.kmall.api.entity.ThirdMerchantBizVo;
 import com.kmall.api.entity.UserVo;
 import com.kmall.api.service.ApiFootprintService;
+import com.kmall.api.service.ApiStoreService;
+import com.kmall.api.service.ApiThirdMerchantBizService;
 import com.kmall.api.util.ApiBaseAction;
 import com.kmall.api.util.ApiPageUtils;
 import com.kmall.common.utils.DateUtils;
@@ -24,6 +28,10 @@ import java.util.*;
 public class ApiFootprintController extends ApiBaseAction {
     @Autowired
     private ApiFootprintService footprintService;
+    @Autowired
+    private ApiThirdMerchantBizService apiThirdMerchantBizService;
+    @Autowired
+    private ApiStoreService apiStoreService;
 
     /**
      */
@@ -103,6 +111,18 @@ public class ApiFootprintController extends ApiBaseAction {
         return this.toResponsSuccess(resultObj);
     }
 
+    private Map setIsStockShare(Long storeId){
+        Map param = Maps.newHashMap();
+        StoreVo storeVo = apiStoreService.queryObject(storeId);
+        if(storeVo != null) {
+            ThirdMerchantBizVo thirdMerchantBiz = apiThirdMerchantBizService.getThirdMerchangByCode(storeVo.getThirdPartyMerchCode());
+            if (null == thirdMerchantBiz) {
+                return toResponsFail("第三方商户为空");
+            }
+            param.put("isStockShare", thirdMerchantBiz.getIsStockShare());
+        }
+        return param;
+    }
     /**
      * 猜你喜欢
      */
@@ -123,6 +143,7 @@ public class ApiFootprintController extends ApiBaseAction {
         params.put("checkCart", checkCart);
         params.put("page", page);
         params.put("limit", size);
+        params.putAll(setIsStockShare(Long.valueOf(storeId)));
         Query query = new Query(params);
         List<FootprintVo> footprintVos = footprintService.queryList(query);
         List<FootprintVo> list = new ArrayList();

kmall-api/src/main/java/com/kmall/api/service/ApiPayService.java

@@ -145,21 +145,6 @@ public class ApiPayService {
                         processRecordEntityList.add(entity);
                     }
 
-                    if(!orderInfo.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_11.getItem())) {
-                        CusPayDataOpenVo cusPayDataOpen = cusPayDataOpenMapper.queryObjectByOrderNo(orderInfo.getOrder_sn());
-                        if (cusPayDataOpen != null) {
-                            cusPayDataOpen.setInitalResponse(reponseStr);
-                            cusPayDataOpen.setPayTransactionId(transaction_id);
-                            cusPayDataOpen.setTotalAmount(new BigDecimal(total_fee).divide(Constant.ONE_HUNDRED));
-                            cusPayDataOpen.setVerDept(Dict.verDept.item_3.getItem());
-                            cusPayDataOpen.setPayType(Dict.payType.item_1.getItem());
-                            cusPayDataOpen.setCurrency(Constant.CURRENCY_142);
-                            cusPayDataOpen.setTradingTime(time_end);
-                            cusPayDataOpen.setModTime(new Date());
-                            cusPayDataOpenMapper.update(cusPayDataOpen);
-                        }
-                    }
-
                     orderInfo.setPayTransactionId(transaction_id);
                     orderInfo.setPay_status(Integer.parseInt(Dict.payStatus.item_2.getItem()));
                     orderInfo.setPay_time(timeEnd);//微信下单完成时间
@@ -200,6 +185,21 @@ public class ApiPayService {
                         logger.error("打印机打印异常【" + e.getMessage() + "】");
                     }*/
                 }
+
+                if(!orderInfo.getOrderBizType().equalsIgnoreCase(Dict.orderBizType.item_11.getItem())) {
+                    CusPayDataOpenVo cusPayDataOpen = cusPayDataOpenMapper.queryObjectByOrderNo(orderInfo.getOrder_sn());
+                    if (cusPayDataOpen != null) {
+                        cusPayDataOpen.setInitalResponse(reponseStr);
+                        cusPayDataOpen.setPayTransactionId(transaction_id);
+                        cusPayDataOpen.setTotalAmount(new BigDecimal(total_fee).divide(Constant.ONE_HUNDRED));
+                        cusPayDataOpen.setVerDept(Dict.verDept.item_3.getItem());
+                        cusPayDataOpen.setPayType(Dict.payType.item_1.getItem());
+                        cusPayDataOpen.setCurrency(Constant.CURRENCY_142);
+                        cusPayDataOpen.setTradingTime(time_end);
+                        cusPayDataOpen.setModTime(new Date());
+                        cusPayDataOpenMapper.update(cusPayDataOpen);
+                    }
+                }
             }
         }
     }

kmall-api/src/main/resources/mybatis/mapper/ApiFootprintMapper.xml

@@ -34,7 +34,19 @@
         left join mall_goods g on f.goods_id = g.id
         LEFT JOIN mall_product_store_rela psr ON psr.goods_id = g.id and g.merch_sn = psr.merch_sn
         <where>
-            1=1 and psr.stock_num >0  and g.is_delete = 0 and g.is_on_sale = 1
+            1=1 and g.is_delete = 0 and g.is_on_sale = 1
+            <if test="bizType == true">
+                <if test="isStockShare == 1 and (checkCart != null and checkCart == '00')">
+                    and g.goods_number > 0
+                </if>
+                <if test="isStockShare == 0 and (checkCart != null and checkCart == '00')">
+                    and psr.stock_num > 0
+                </if>
+                <if test="checkCart != null and checkCart == '11'">
+                    and psr.stock_num > 0
+                </if>
+            </if>
+
             <if test="user_id != null">
                 and f.user_id = #{user_id}
             </if>