From bbe0a2fd03063316e50cf141986bda984599bbda Mon Sep 17 00:00:00 2001
From: 935090232@qq.com <ak473600000>
Date: Tue, 22 Feb 2022 23:41:42 +0800
Subject: [PATCH] Merge branch 'developer'
---
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxScoreProductAction.java | 20 +++++++++++++-------
1 files changed, 13 insertions(+), 7 deletions(-)
diff --git a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxScoreProductAction.java b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxScoreProductAction.java
index aa403fd..ebdc64d 100644
--- a/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxScoreProductAction.java
+++ b/zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxScoreProductAction.java
@@ -1,11 +1,14 @@
package com.matrix.system.shopXcx.api.action;
import com.matrix.core.pojo.AjaxResult;
+import com.matrix.core.tools.StringUtils;
import com.matrix.system.common.constance.AppConstance;
import com.matrix.system.common.interceptor.HostInterceptor;
import com.matrix.system.shopXcx.api.dto.SaleProductDto;
import com.matrix.system.shopXcx.api.dto.ScoreProductDto;
import com.matrix.system.shopXcx.bean.ShopProduct;
+import com.matrix.system.shopXcx.bean.ShopProductAttribute;
+import com.matrix.system.shopXcx.dao.ShopProductAttributeDao;
import com.matrix.system.shopXcx.dao.ShopProductDao;
import com.matrix.system.shopXcx.dao.ShopSkuDao;
import io.swagger.annotations.Api;
@@ -36,6 +39,9 @@
@Autowired
private ShopSkuDao shopSkuDao;
+ @Autowired
+ ShopProductAttributeDao shopProductAttributeDao;
+
@ApiOperation(value = "查询积分商品", notes = "")
@PostMapping(value = "/getScoreProductList")
@ApiResponses({
@@ -50,17 +56,17 @@
shopProduct.setStatus(AppConstance.IS_PUTAWAY);
shopProduct.setAbleScorePay(ShopProduct.PAYFOR_SCORE);
shopProduct.setCompanyId(HostInterceptor.getCompanyId());
+ //根据属性查询
+ if(StringUtils.isNotBlank(scoreProductDto.getAttrCode())){
+ ShopProductAttribute jfscrmtj = shopProductAttributeDao.selectByCode("jfscrmtj", HostInterceptor.getCompanyId());
+ if(jfscrmtj!=null){
+ shopProduct.setAttrs(jfscrmtj.getAttrId()+"");
+ }
+ }
List<ShopProduct> shopProducts = shopProductDao.selectByModelWx(shopProduct);
shopProducts.forEach(item->item.setSkus(shopSkuDao.selectByPid(item.getId())));
return AjaxResult.buildSuccessInstance(shopProducts);
}
-
-
-
-
-
-
-
}
--
Gitblit v1.9.1