zq-erp/src/main/java/com/matrix/system/app/action/ApiOrderAction.java
@@ -84,7 +84,10 @@ @PostMapping(value = "/findShoppingGoods") public AjaxResult findShoppingGoods(@RequestBody @Validated ShoppingGoodsListDto shoppingGoodsListDto) { SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); shoppingGoodsListDto.setShopId(user.getShopId()); if (!DataAuthUtil.hasAllShopAuth()) { shoppingGoodsListDto.setShopId(user.getShopId()); } QueryUtil.setQueryLimitCom(shoppingGoodsListDto); return AjaxResult.buildSuccessInstance(shoppingGoodsService.findShoppingGoodsListForApi(shoppingGoodsListDto), shoppingGoodsService.findShoppingGoodsListTotalForApi(shoppingGoodsListDto)); }
@@ -215,6 +215,7 @@ SysUsers user = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY); orderListDto.setShopId(user.getShopId()); } QueryUtil.setQueryLimitCom(orderListDto); return AjaxResult.buildSuccessInstance(projServicesService.findApiServiceOrderListInPage(orderListDto, pageVo), projServicesService.findApiServiceOrderListTotal(orderListDto)); }
@@ -19,6 +19,7 @@ import com.matrix.system.common.tools.DataAuthUtil; import com.matrix.system.common.tools.PasswordUtil; import com.matrix.system.hive.action.BaseController; import com.matrix.system.hive.action.util.QueryUtil; import com.matrix.system.hive.bean.*; import com.matrix.system.hive.dao.MoneyCardUseDao; import com.matrix.system.hive.dao.VipAnswerDao; @@ -165,7 +166,7 @@ if(!DataAuthUtil.hasAllShopAuth()) { sysVipInfo.setShopId(user.getShopId()); } QueryUtil.setQueryLimitCom(sysVipInfo); return AjaxResult.buildSuccessInstance(sysVipInfoService.findAll(sysVipInfo)); }
@@ -1259,6 +1259,9 @@ <![CDATA[ and ( a.shop_id = #{record.shopId} or ( a.headquarters=1 and ( ISNULL(a.use_shop) or LENGTH(trim(a.use_shop))<1 or FIND_IN_SET(#{record.shopId},a.use_shop))))]]> </if> <if test="record.companyId != null and record.companyId !='' "> a.company_id=#{record.companyId} </if> <if test="record.goodType!=null"> and a.good_type=#{record.goodType} </if> zq-erp/src/main/resources/templates/views/admin/hive-erp/order/orderXq-form.html
@@ -108,7 +108,7 @@ </el-col> <el-col :span="14" style="text-align: right;"> <label>¥ {{order.total}}</label> <label>¥ {{order.zkTotal - order.total}}</label> <label>¥ {{(order.zkTotal - order.total).toFixed(2)}}</label> <label>¥ {{order.zkTotal}}</label> <label>¥ {{order.arrears}}</label> <label>¥ {{order.repay}}</label> zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/order-form.html
@@ -516,7 +516,7 @@ <el-row style="line-height: 50px;" v-for="(item, index) in payMoneys"> <el-col :span="6" style="text-align: right; padding-right: 10px; font-size: 12px;">{{item.value}}</el-col> <el-col :span="8"><el-input v-model="item.money"></el-input></el-col> <el-col :span="6" style="margin-left: 10px;" v-if="item.type == '储值卡'">{{item.isGift == 1 ? '赠送余额' : '余额' }}：<span class="arrears">¥ {{item.balance}}</span></el-col> <el-col :span="8" style="margin-left: 10px;" v-if="item.type == '储值卡'">{{item.isGift == 1 ? '赠送余额' : '余额' }}：<span class="arrears">¥ {{item.balance}}</span></el-col> </el-row> </el-col> </el-row> @@ -906,7 +906,7 @@ } }) }); _this.order.payMoney = _this.order.payMoney.toFixed(2); //计算欠款 // _this.order.arrears = _this.order.zkTotal - _this.order.payMoney; // if (_this.order.arrears < 0) { zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/orderXq-form.html
@@ -108,7 +108,7 @@ </el-col> <el-col :span="14" style="text-align: right;"> <label>¥ {{order.total}}</label> <label>¥ {{order.zkTotal - order.total}}</label> <label>¥ {{(order.zkTotal - order.total).toFixed(2)}}</label> <label>¥ {{order.zkTotal}}</label> <label>¥ {{order.arrears}}</label> <label>¥ {{order.repay}}</label>
