clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

需求大厅问题

This commit is contained in:
kuang.yife 2023-10-08 22:23:21 +08:00
parent 57a211bbce
commit 8e661f0211
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ghy-admin/src/main/resources/templates/goods/standard/addTemplate.html
View File

@ -248,13 +248,13 @@
<label class="col-sm-2 control-label is-required">下单模式：</label>
<div class="col-sm-8 row" id="orderModeRadioGroup">
<div class="col-sm-2">
<label><input id="publishWithPrice" type="radio" value="02" name="orderMode" checked onclick="selectPublishWithPrice(this)"> 带价发布</label>
<label><input type="radio" value="02" name="orderMode" checked > 带价发布</label>
</div>
<div class="col-sm-2">
<label><input type="radio" value="01" name="orderMode"> 一票价发布</label>
</div>
<div class="col-sm-2">
<label><input type="radio" value="01" name="orderMode"> 回收模式</label>
<label><input type="radio" value="03" name="orderMode"> 回收模式</label>
</div>
</div>
</div>
@ -533,11 +533,6 @@
<!-- })-->
<!-- }-->
function selectPublishWithPrice(e) {
<!-- if ($(e).is(':checked')) {-->
<!-- $('#payOnDoorMode').prop("checked", false);-->
<!-- }-->
}
function changePayOnDoorMode(e) {
if ($(e).is(':checked')) {

4
ghy-admin/src/main/resources/templates/order/pc-master.html
View File

@ -72,7 +72,7 @@
<option value="">全部</option>
<option value="">在途</option>
</select>
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, sysPayStatus: 0, orderMode: '02'})">
<a class="btn btn-default btn-outline" onclick="selectConditionBtn(this, {orderStatus: 0, sysPayStatus: 0, payMode: '02'})">
待付款
(<span id="nonPaidOrderNum">0</span>)
</a>
@ -284,7 +284,7 @@
type: "GET",
dataType:"json",
url: prefix + '/count',
data: {orderStatus: 0, sysPayStatus: 0, orderMode: '02'},
data: {orderStatus: 0, sysPayStatus: 0, payMode: '02'},
success: function (result) {
if (result.code == web_status.SUCCESS) {
$('#nonPaidOrderNum').text(result.data);

14
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -141,14 +141,14 @@
</if>
<if test="workerId == -1">
AND om.worker_id IS NULL
AND ( (om.order_mode in ('01','03','04','02')) OR (om.order_mode is null))
AND (om.pay_mode = '01' OR (om.pay_mode = '02' and om.pay_status = '1'))
</if>
<if test="payMode != null">
AND om.pay_mode = #{payMode}
</if>
<if test="sysPayStatus != null">
AND fm.pay_status = #{sysPayStatus}
</if>
<if test="orderMode != null and orderMode != ''">
AND om.order_mode = #{orderMode}
</if>
<if test="goodsCategoryId != null">
AND g.dept_goods_category_id = #{goodsCategoryId}
</if>
@ -254,8 +254,10 @@
</if>
<if test="workerId == -1">
AND om.worker_id IS NULL
AND ( (om.order_mode in ('01','02', '03','04'))
OR (om.order_mode = '02' and fm.pay_status = 1) )
AND (om.pay_mode = '01' OR (om.pay_mode = '02' and om.pay_status = '1'))
</if>
<if test="payMode != null">
AND om.pay_mode = #{payMode}
</if>
<if test="sysPayStatus != null">
AND fm.pay_status = #{sysPayStatus}