| @@ -3070,7 +3070,9 @@ public class WxOrderServiceImpl implements WxOrderService { | |||||
| batchOrderQ.setCUserId(wxOrder.getCUserId()); | batchOrderQ.setCUserId(wxOrder.getCUserId()); | ||||
| batchOrderQ.setPayVendor(wxOrder.getPayVendor()); | batchOrderQ.setPayVendor(wxOrder.getPayVendor()); | ||||
| List<Long> composeOrderIds = wxOrderMapper.getComposeOrderIds(wxOrder); | List<Long> composeOrderIds = wxOrderMapper.getComposeOrderIds(wxOrder); | ||||
| if(composeOrderIds != null && composeOrderIds.size() > 0){ | |||||
| if(composeOrderIds == null || composeOrderIds.isEmpty()){ | |||||
| batchOrderQ.setId(-999L); | |||||
| }else{ | |||||
| batchOrderQ.setIds(composeOrderIds); | batchOrderQ.setIds(composeOrderIds); | ||||
| } | } | ||||
| PageInfo<WxBatchOrder> page = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBatchOrderMapper.findCOrderList(batchOrderQ)); | PageInfo<WxBatchOrder> page = PageHelper.startPage(pageNum, pageSize).doSelectPageInfo(() -> wxBatchOrderMapper.findCOrderList(batchOrderQ)); | ||||
| @@ -71,6 +71,9 @@ | |||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and o.`parent_tenant_id` = #{parentTenantId} | and o.`parent_tenant_id` = #{parentTenantId} | ||||
| </if> | </if> | ||||
| <if test=" null != id "> | |||||
| and o.`id` = #{id} | |||||
| </if> | |||||
| <if test=" null != payVendor "> | <if test=" null != payVendor "> | ||||
| and o.pay_vendor = #{payVendor} | and o.pay_vendor = #{payVendor} | ||||
| </if> | </if> | ||||
| @@ -1128,6 +1128,7 @@ | |||||
| <select id="getComposeOrderIds" parameterType="com.iformall.domain.po.WxOrder" resultType="Long"> | <select id="getComposeOrderIds" parameterType="com.iformall.domain.po.WxOrder" resultType="Long"> | ||||
| select distinct compose_order_id from wx_order | select distinct compose_order_id from wx_order | ||||
| where parent_order_id = 0 | where parent_order_id = 0 | ||||
| and order_status in (0,1,2,3,4,5) | |||||
| and `tenant_id` = #{tenantId} | and `tenant_id` = #{tenantId} | ||||
| <if test=" null != parentTenantId and '' != parentTenantId"> | <if test=" null != parentTenantId and '' != parentTenantId"> | ||||
| and `parent_tenant_id` = #{parentTenantId} | and `parent_tenant_id` = #{parentTenantId} | ||||