Explorar el Código

[拼团][修改][下单问题]

release_toaliyun_real
gongbiao hace 7 años
padre
commit
9e163f6f4a
Se han modificado 2 ficheros con 7 adiciones y 1 borrados
  1. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java
  2. +6
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java

+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxOrderController.java Ver fichero

@@ -98,7 +98,7 @@ public class WxOrderController extends BaseController {
if (StringUtils.isBlank(couponChannelIdStr)) { if (StringUtils.isBlank(couponChannelIdStr)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponChannelId不能为空");
} }
Long couponChannelId = 0L, couponId = 0L, orderGroupId = 0L;
Long couponChannelId = 0L, couponId = 0L, orderGroupId = null;
boolean isPress = false; boolean isPress = false;


if (StringUtils.isNotBlank(couponChannelIdStr)) { if (StringUtils.isNotBlank(couponChannelIdStr)) {


+ 6
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Ver fichero

@@ -341,6 +341,11 @@ public class WxOrderServiceImpl implements WxOrderService {
payment = coupon.getPrice(); payment = coupon.getPrice();
} }


if (orderGroupId == null) {
// 拼团券 初始是全价即面额
payment = coupon.getPrice();
}

final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
Long orderNumber = idWorker.nextId(); Long orderNumber = idWorker.nextId();


@@ -370,6 +375,7 @@ public class WxOrderServiceImpl implements WxOrderService {
record.setCreateDate(curr); record.setCreateDate(curr);
record.setUpdateDate(curr); record.setUpdateDate(curr);
record.setOrderGroupId(orderGroupId); record.setOrderGroupId(orderGroupId);

if (isPress) { if (isPress) {
// 初始砍价信息 // 初始砍价信息
record.setPressCurrentNum(0); record.setPressCurrentNum(0);


Cargando…
Cancelar
Guardar