Просмотр исходного кода

[拼团][修改][待支付]

release_toaliyun_real
gongbiao 7 лет назад
Родитель
Сommit
8214202f31
4 измененных файлов: 16 добавлений и 4 удалений
  1. +2
    -2
      mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java
  2. +11
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
  3. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  4. +1
    -1
      mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml

+ 2
- 2
mallinkService/src/main/java/com/iformall/enums/EnumOrderStatus.java Просмотреть файл

@@ -22,8 +22,8 @@ public enum EnumOrderStatus {
ORDER_STATUS_COOPERATING_OVERTIME(12, "拼团已过期"), ORDER_STATUS_COOPERATING_OVERTIME(12, "拼团已过期"),
ORDER_STATUS_COOPERATING_CANCEL(13, "拼团失败"), ORDER_STATUS_COOPERATING_CANCEL(13, "拼团失败"),
ORDER_STATUS_COOPERATING_FAILD(14, "参团失败"), ORDER_STATUS_COOPERATING_FAILD(14, "参团失败"),
ORDER_STATUS_COOPERATING_UNPAID(15, "拼团待付款")
ORDER_STATUS_COOPERATING_UNPAID(15, "拼团待付款"),
ORDER_STATUS_COOPERATING_BREAK(16, "拼团取消")
; ;


public static EnumOrderStatus getEnum(Integer code) { public static EnumOrderStatus getEnum(Integer code) {


+ 11
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java Просмотреть файл

@@ -118,6 +118,17 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD); throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FAILD);
} }
} }
//拼团成功后把待支付的取消
wxOrder.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_UNPAID.getCode());
list = wxOrderMapper.select(wxOrder);
for (WxOrder temp : list) {
//去库存
wxOrderService.updateOrderStatus(temp);
//拼团取消
temp.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode());
wxOrderMapper.updateByPrimaryKeySelective(temp);
}

} }
} else { } else {
logger.info("首次拼团,创建拼团信息"); logger.info("首次拼团,创建拼团信息");


+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Просмотреть файл

@@ -1025,7 +1025,8 @@ public class WxOrderServiceImpl implements WxOrderService {
if (updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()) || if (updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_OVERTIME.getCode()) ||
updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()) || updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_CANCEL.getCode()) ||
updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()) || updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode()) ||
updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode())) {
updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_FAILD.getCode()) ||
updateOrder.getOrderStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_BREAK.getCode())) {
try { try {
stockBack(updateOrder); stockBack(updateOrder);
} catch (Exception e) { } catch (Exception e) {


+ 1
- 1
mallinkService/src/main/resources/mapper/WxOrderGroupMapper.xml Просмотреть файл

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


Загрузка…
Отмена
Сохранить