jyy
2021-03-19 859af35a1dab1079cff82e521422ab24963f828b
积分商城5
3 files modified
19 ■■■■■ changed files
zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WxScoreProductAction.java 14 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/ScoreProductDto.java 2 ●●●●● patch | view | raw | blame | history
zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html 3 ●●●●● patch | view | raw | blame | history
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,6 +56,13 @@
        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);
@@ -63,4 +76,5 @@
}
zq-erp/src/main/java/com/matrix/system/shopXcx/api/dto/ScoreProductDto.java
@@ -13,6 +13,8 @@
    private Integer scoreCategoryId;
    @ApiModelProperty(value = "属性编码", example = "jfscrmtj")
    private String attrCode;
}
zq-erp/src/main/resources/templates/views/admin/shop/shopAdvertisType-list.html
@@ -518,7 +518,10 @@
            //改变编辑页面,切换页面元素
            changePage(index){
                this.currentPage=this.pageList[index];
                this.currentPageCode=this.pageList[index].code;
                console.log(this.currentPageCode);
                this.loadPageAds();
            },
            loadPageAds() {