forked from beauty-erp
zq-erp/src/main/java/com/matrix/system/fenxiao/action/FenXiaoSettingAction.java
@@ -5,15 +5,21 @@ import com.matrix.biz.dao.BizUserDao; import com.matrix.core.constance.MatrixConstance; import com.matrix.core.pojo.AjaxResult; import com.matrix.core.pojo.PaginationVO; import com.matrix.core.tools.WebUtil; import com.matrix.system.common.bean.BusParameterSettings; import com.matrix.system.common.bean.SysUsers; import com.matrix.system.common.constance.AppConstance; import com.matrix.system.common.dao.BusParameterSettingsDao; import com.matrix.system.fenxiao.constant.FenxiaoSettingConstant; import com.matrix.system.fenxiao.service.FenXiaoSettingService; import com.matrix.system.fenxiao.vo.FenXiaoSettingVo; import com.matrix.system.hive.action.util.QueryUtil; import com.matrix.system.hive.bean.ShoppingGoods; import com.matrix.system.hive.dao.ShoppingGoodsDao; import com.matrix.system.shopXcx.bean.ShopProduct; import com.matrix.system.shopXcx.dao.ShopProductDao; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -37,6 +43,9 @@ @Autowired private BizUserDao bizUserDao; @Autowired private ShopProductDao shopProductDao; /** *查询分销配置 @@ -97,6 +106,24 @@ } /** * 列表显示 */ @RequestMapping(value = "/selectProduct") public @ResponseBody AjaxResult selectProduct(ShopProduct shopProduct, PaginationVO pageVo) { QueryUtil.setQueryLimitCom(shopProduct); pageVo.setSort("createTime"); pageVo.setOrder("desc"); shopProduct.setDelFlag(AppConstance.DATA_USEABLE); shopProduct.setCompanyId(shopProduct.getCompanyId()); List<ShopProduct> dataList = shopProductDao.selectInPage(shopProduct, pageVo); AjaxResult result = new AjaxResult(AjaxResult.STATUS_SUCCESS, dataList, shopProductDao.selectTotalRecord(shopProduct)); return result; } /** *获取对应的规则设置数据 * @param ArrayCode * @param ArrayName zq-erp/src/main/resources/mybatis/mapper/fenxiao/ShopSalesmanApplyDao.xml
@@ -212,9 +212,9 @@ ( SELECT COUNT(*) FROM biz_user WHERE parent_open_id = a.user_id AND is_sales = 1 ) invitedNum, ( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order WHERE user_id = a.user_id AND order_status = 2 AND sales_user_id = a.user_id ) totalRevenue, WHERE order_status = 2 AND sales_user_id = a.user_id ) totalRevenue, ( SELECT IFNULL(sum(IFNULL(amount, 0)), 0) FROM shop_salesman_order WHERE user_id = a.user_id AND order_status = 1 AND sales_user_id = a.user_id ) balance, WHERE order_status = 1 AND sales_user_id = a.user_id ) balance, a.create_time createTime, a.apply_status applyStatus, a.apply_way applyWay zq-erp/src/main/resources/templates/views/admin/fenxiao/fenxiao-setting.html
@@ -149,28 +149,32 @@ width="50"> </el-table-column> <el-table-column prop="code" label="产品编号" width="100"> prop="id" label="ID"> </el-table-column> <el-table-column prop="name" prop="title" label="产品名称"> </el-table-column> <el-table-column prop="sealPice" label="售价"> prop="price" label="价格"> </el-table-column> <el-table-column prop="goodType" label="类型"> prop="score" label="积分"> </el-table-column> <el-table-column prop="cateName" label="分类"> prop="attrValues" label="产品属性"> </el-table-column> <el-table-column label="是否上架"> <template slot-scope="scope"> <span v-if="scope.row.status == 1">是</span> <span v-if="scope.row.status == 2">否</span> </template> </el-table-column> <el-table-column width="150" @@ -202,30 +206,29 @@ width="50"> </el-table-column> <el-table-column prop="shoppingGoods.code" label="产品编号" width="100"> prop="ShopProduct.id" width="280" label="产品ID"> </el-table-column> <el-table-column prop="shoppingGoods.name" prop="ShopProduct.title" width="280" label="产品名称"> </el-table-column> <el-table-column prop="shoppingGoods.goodType" prop="ShopProduct.attrValues" width="80" label="产品类型"> label="产品属性"> </el-table-column> <el-table-column prop="shoppingGoods.sealPice" prop="ShopProduct.price" label="单价"> </el-table-column> <el-table-column prop="address" label="操作"> <template slot-scope="scope"> <el-button type="primary" v-if="order.statu!='欠款'" <el-button type="primary" size="mini" @click="removeItem(scope.$index, scope.row)">删除 </el-button> @@ -343,7 +346,7 @@ //判断是否被选中 let selected = false; this.order.items.forEach(item => { if (item.shoppingGoods.id == goods.id) { if (item.ShopProduct.id == goods.id) { selected = true; return; } @@ -351,7 +354,7 @@ if (!selected) { //未选中产品加入列表 let item = {}; item.shoppingGoods = goods; item.ShopProduct = goods; item.goodsId = goods.id; item.count = 1; this.order.items.push(item); @@ -374,11 +377,12 @@ let submitDate =""; for (let i = 0; i < _this.order.items.length; i++) { let goods = _this.order.items[i]; let goodsId = goods.goodsId; let goodsId = goods.id; submitDate = submitDate +goodsId+","; } alert(submitDate); _this.cpid = submitDate; _this.drawer = false _this.drawer = false; }, /** * 批量选择产品 @@ -394,7 +398,7 @@ * 行点击事件 */ handleClickTableRow(row, event, column) { this.$refs.dataTable.toggleRowSelection(row); this.pushToSelectGoods(row); }, /** * 删除组合产品 @@ -417,7 +421,8 @@ contentType: 'application/x-www-form-urlencoded', //TODO 优化下拉加载 data: {name: _this.queryKey, limit: 10000}, url: basePath + "/admin/shoppinggoods/showList", //url: basePath + "/admin/shoppinggoods/showList", url: basePath + "/fenXiao/ruleSetting/selectProduct", callback: function (data) { _this.searchTableData = data.rows; _this.loading = false;
