Преглед изворни кода

[拼团][修改][查询]

release_toaliyun_real
gongbiao пре 7 година
родитељ
комит
1d5182dff2
2 измењених фајлова са 5 додато и 2 уклоњено
  1. +4
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml

+ 4
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java Прегледај датотеку

@@ -199,7 +199,9 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
wxOrder = new WxOrder(); wxOrder = new WxOrder();
wxOrder.setOrderGroupId(wxOrderGroup.getId()); wxOrder.setOrderGroupId(wxOrderGroup.getId());
wxOrder.setTenantId(wxOrderGroup.getTenantId()); wxOrder.setTenantId(wxOrderGroup.getTenantId());
List<WxOrder> orderList = wxOrderMapper.select(wxOrder);
wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode());
List<WxOrder> orderList = wxOrderMapper.select(wxOrder).parallelStream()
.sorted(Comparator.comparing(order -> order.getId())).collect(Collectors.toList());
if (!orderList.isEmpty()) { if (!orderList.isEmpty()) {
List<Long> ids = new ArrayList<>(); List<Long> ids = new ArrayList<>();
for (WxOrder order : orderList) { for (WxOrder order : orderList) {
@@ -231,6 +233,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
order.setTenantId(wxOrderGroup.getTenantId()); order.setTenantId(wxOrderGroup.getTenantId());
order.setCUserId(wxOrderGroup.getUserId()); order.setCUserId(wxOrderGroup.getUserId());
order.setOrderGroupId(wxOrderGroup.getId()); order.setOrderGroupId(wxOrderGroup.getId());
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode());
int count = wxOrderMapper.selectCount(order); int count = wxOrderMapper.selectCount(order);
WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(wxOrderGroup.getId()); WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(wxOrderGroup.getId());
Map<String, Object> result = new HashMap<>(2); Map<String, Object> result = new HashMap<>(2);


+ 1
- 1
mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml Прегледај датотеку

@@ -83,7 +83,7 @@
<if test=" null != id "> <if test=" null != id ">
and o.id=#{id} and o.id=#{id}
</if> </if>
and o.order_group_id!=0
and o.order_group_id!=0 and o.order_status in(10,11,12,13)
order by o.id desc,o.order_status order by o.id desc,o.order_status
</select> </select>


Loading…
Откажи
Сачувај