提交修改

api-mapper/src/main/java/com/heyu/api/data/dto/VvProductFrontDTO.java

@@ -0,0 +1,17 @@
+package com.heyu.api.data.dto;
+
+import com.heyu.api.data.entity.vv.VvProductEntity;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+
+@Data
+public class VvProductFrontDTO extends VvProductEntity {
+
+    /***
+     * 折扣价格
+     */
+    private BigDecimal discountAmount = BigDecimal.ZERO;
+
+}

api-mapper/src/main/java/com/heyu/api/data/dto/vv/VvSkuDTO.java

@@ -4,12 +4,22 @@ import com.heyu.api.data.entity.vv.VvSkuEntity;
 import com.heyu.api.data.entity.vv.VvSkuPropertyValueEntity;
 import lombok.Data;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Data
 public class VvSkuDTO extends VvSkuEntity {
 
 
+    /***
+     *
+     */
     private List<VvSkuPropertyValueEntity> vvSkuPropertyValueList;
 
+
+    /***
+     * 折扣价格
+     */
+    private BigDecimal discountAmount = BigDecimal.ZERO;
+
 }

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppActivityController.java

@@ -42,10 +42,12 @@ public class AppActivityController {
     @Describe("访问推广链接")
     @RequestMapping("/info")
     public R list(@RequestBody AppActivityRequest request) {
+
         Long activityId = request.getActivityId();
         if (request.getActivityId() == null) {
-            activityId = 1L;
+            activityId = 2L;
         }
+
         VvActivityEntity vvActivityEntity = vvActivityDao.selectVvActivityById(activityId);
         if (StringUtils.isNotEmpty(request.getToken())) {
             VvActivityDTO vvActivityDTO = new VvActivityDTO();

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppIndexPageController.java

@@ -1,18 +1,24 @@
 package com.heyu.api.controller.vv;
 
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.heyu.api.alibaba.request.mm.VvProductDetailRequest;
-import com.heyu.api.data.enums.ProductStatusEnums;
+import com.heyu.api.alibaba.request.mm.order.VvActivityDTO;
 import com.heyu.api.alibaba.request.vv.AppIndexPageRequest;
 import com.heyu.api.common.annotation.Describe;
+import com.heyu.api.data.constants.ApiConstants;
 import com.heyu.api.data.dao.vv.*;
+import com.heyu.api.data.dto.VvProductFrontDTO;
 import com.heyu.api.data.dto.vv.VvProductDTO;
 import com.heyu.api.data.dto.vv.VvProductPropertyDTO;
 import com.heyu.api.data.dto.vv.VvSkuDTO;
 import com.heyu.api.data.entity.vv.*;
+import com.heyu.api.data.enums.ProductStatusEnums;
 import com.heyu.api.data.utils.NumberUtil;
 import com.heyu.api.data.utils.R;
+import com.heyu.api.data.utils.RedisUtils;
+import com.heyu.api.data.utils.StringUtils;
 import com.heyu.api.utils.ISelect;
 import com.heyu.api.utils.PPageUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -56,7 +62,10 @@ public class AppIndexPageController {
 
 
     @Autowired
-    private VvBuyerDao vvBuyerDao ;
+    private VvBuyerDao vvBuyerDao;
+
+    @Autowired
+    private RedisUtils redisUtils;
 
     /***
      * 列表        /app/index/page/list
@@ -64,13 +73,11 @@ public class AppIndexPageController {
     @RequestMapping("/page/list")
     @Describe("商品首页列表")
     public R list(@RequestBody AppIndexPageRequest vvProductRequest) {
-        vvProductRequest.setFrontPage(1);
         vvProductRequest.setStatus(ProductStatusEnums.online.getStatus());
-
+        if (NumberUtil.equals(vvProductRequest.getIsTest(), 1)) {
-        if(NumberUtil.equals(vvProductRequest.getIsTest() ,1)){
             Long buyerId = vvProductRequest.getBuyerId();
             VvBuyerEntity vvBuyerEntity = vvBuyerDao.selectVvBuyerIsTestById(buyerId, 1);
-            if(vvBuyerEntity == null){
+            if (vvBuyerEntity == null) {
                 return R.error("非内部用户");
             }
         }
@@ -95,6 +102,22 @@ public class AppIndexPageController {
                     }
                 });
 
+        // 折扣价格
+        VvActivityDTO vvActivityDTO = null;
+        String activityTokenInfo = redisUtils.get(ApiConstants.token_activity + vvProductRequest.getToken());
+
+        if(StringUtils.isNotEmpty(activityTokenInfo)){
+            vvActivityDTO = JSONObject.parseObject(activityTokenInfo, VvActivityDTO.class);
+        }
+        List<VvProductEntity> vvProductEntities = pageUtils.getRows();
+        for (VvProductEntity vvProductEntity : vvProductEntities) {
+            VvProductFrontDTO vvProductFrontDTO = new VvProductFrontDTO();
+            BeanUtils.copyProperties(vvProductEntity, vvProductFrontDTO);
+            if (vvActivityDTO !=null) {
+                vvProductFrontDTO.setDiscountAmount(vvActivityDTO.getDiscountAmount());
+            }
+        }
+        pageUtils.setRows(vvProductEntities);
         return R.ok().setData(pageUtils);
     }
 
@@ -108,15 +131,10 @@ public class AppIndexPageController {
         VvProductEntity vvProduct = vvProductDao.selectVvProductById(vvProductDetailRequest.getProductId());
 
         BeanUtils.copyProperties(vvProduct, vvProductDTO);
-
         List<VvProductDetailEntity> productDetailEntities = vvProductDetailDao.selectVvProductDetailByProductId(vvProductDetailRequest.getProductId());
-
         vvProductDTO.setVvProductDetailList(productDetailEntities);
-
         List<VvSkuEntity> vvSkuEntities = vvSkuDao.selectAppSkuByProductId(vvProductDetailRequest.getProductId());
-
         List<VvSkuDTO> vvSkuDTOS = new ArrayList<>();
-
         List<VvSkuPropertyValueEntity> vvSkuPropertyValueList = vvSkuPropertyValueDao.selectVvSkuPropertyValueByProductId(vvProduct.getId());
 
         Map<Long, List<VvSkuPropertyValueEntity>> vvSkuPropertyValueMap = new LinkedHashMap<>();
@@ -126,33 +144,31 @@ public class AppIndexPageController {
             if (vvSkuPropertyValueEntities == null) {
                 vvSkuPropertyValueEntities = new ArrayList<>();
             }
-
             vvSkuPropertyValueEntities.add(vvSkuPropertyValueEntity);
-
             vvSkuPropertyValueMap.put(vvSkuPropertyValueEntity.getSkuId(), vvSkuPropertyValueEntities);
         }
 
-
+        // 折扣价格
+        VvActivityDTO vvActivityDTO = null;
+        String activityTokenInfo = redisUtils.get(ApiConstants.token_activity + vvProductDetailRequest.getToken());
+        if(StringUtils.isNotEmpty(activityTokenInfo)){
+            vvActivityDTO = JSONObject.parseObject(activityTokenInfo, VvActivityDTO.class);
+        }
         for (VvSkuEntity vvSkuEntity : vvSkuEntities) {
-
             VvSkuDTO vvSkuDTO = new VvSkuDTO();
-
             BeanUtils.copyProperties(vvSkuEntity, vvSkuDTO);
-
             List<VvSkuPropertyValueEntity> vvSkuPropertyValueEntities = vvSkuPropertyValueMap.get(vvSkuEntity.getId());
-
             vvSkuDTO.setVvSkuPropertyValueList(vvSkuPropertyValueEntities);
 
+            if(vvActivityDTO !=null){
+                vvSkuDTO.setDiscountAmount(vvActivityDTO.getDiscountAmount());
+            }
             vvSkuDTOS.add(vvSkuDTO);
         }
-
         vvProductDTO.setVvSkuList(vvSkuDTOS);
 
         List<VvProductPropertyEntity> vvProductPropertyEntities = vvProductPropertyDao.selectVvProductPropertyByProductId(vvProductDetailRequest.getProductId());
-
-
         List<VvProductPropertyValueEntity> productPropertyValueList = vvProductPropertyValueDao.selectVvProductPropertyValueByProductIdProductId(vvProduct.getId());
-
         Map<Long, List<VvProductPropertyValueEntity>> productPropertyValueMap = new LinkedHashMap<>();
         for (VvProductPropertyValueEntity productPropertyValueEntity : productPropertyValueList) {
             List<VvProductPropertyValueEntity> vvProductPropertyValueEntities = productPropertyValueMap.get(productPropertyValueEntity.getProductPropertyId());
@@ -163,9 +179,7 @@ public class AppIndexPageController {
             productPropertyValueMap.put(productPropertyValueEntity.getProductPropertyId(), vvProductPropertyValueEntities);
         }
 
-
         List<VvProductPropertyDTO> vvProductPropertyDTOS = new ArrayList<>();
-
         for (VvProductPropertyEntity vvProductPropertyEntity : vvProductPropertyEntities) {
 
             VvProductPropertyDTO vvProductPropertyDTO = new VvProductPropertyDTO();
@@ -175,11 +189,9 @@ public class AppIndexPageController {
             List<VvProductPropertyValueEntity> productPropertyValues = productPropertyValueMap.get(vvProductPropertyEntity.getId());
 
             vvProductPropertyDTO.setVvProductPropertyValueList(productPropertyValues);
-
             vvProductPropertyDTOS.add(vvProductPropertyDTO);
         }
         vvProductDTO.setVvProductPropertyList(vvProductPropertyDTOS);
-
         return R.ok().setData(vvProductDTO);
     }
 

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterBuyerController.java

@@ -20,7 +20,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/app/promoter")
 @AppLogin
-public class AppPromoterController {
+public class AppPromoterBuyerController {
 
 
     //@Autowired

api-web/api-interface/src/main/java/com/heyu/api/controller/vv/AppPromoterTradeOrderAwardController.java

@@ -19,7 +19,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/app/promoter/award")
 @AppLogin
-public class AppPromoterAwardLineController {
+public class AppPromoterTradeOrderAwardController {