Explorar el Código

[拼团][修改][去拼团]

release_toaliyun_real
gongbiao hace 7 años
padre
commit
63108c10a9
Se han modificado 2 ficheros con 5 adiciones y 9 borrados
  1. +4
    -8
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java

+ 4
- 8
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java Ver fichero

@@ -5,9 +5,10 @@ import com.iformall.common.ErrorCode;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.config.PayProperty; import com.iformall.config.PayProperty;
import com.iformall.domain.po.*;
import com.iformall.enums.EnumCouponType;
import com.iformall.enums.EnumOrderStatus;
import com.iformall.domain.po.WxAppinfo;
import com.iformall.domain.po.WxCUser;
import com.iformall.domain.po.WxOrder;
import com.iformall.domain.po.WxPayOrder;
import com.iformall.enums.EnumPayStatus; import com.iformall.enums.EnumPayStatus;
import com.iformall.enums.EnumPayWay; import com.iformall.enums.EnumPayWay;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
@@ -126,11 +127,6 @@ public class WxPayOrderController extends BaseController {
payOrder = wxPayOrderService.getById(payOrderId); payOrder = wxPayOrderService.getById(payOrderId);
if(payOrder.getPayOrderStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) { if(payOrder.getPayOrderStatus().equals(EnumPayStatus.PAY_STATUS_SUCCESS.getCode())) {
order = wxOrderService.getById(orderId); order = wxOrderService.getById(orderId);
WxCoupon coupon = wxCouponService.getById(order.getProductId());
if (coupon.getType().equals(EnumCouponType.COUPON_GROUP.getCode())) {
order.setOrderStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode());
wxOrderService.saveOrUpdate(order);
}
return new ResultData(Result.SUCCESS, "支付状态更新成功", order); return new ResultData(Result.SUCCESS, "支付状态更新成功", order);
} else { } else {
return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付未状态,请等待!!"); return new ResultData(ErrorCode.PAY_ORDER_ERROR, "支付未状态,请等待!!");


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java Ver fichero

@@ -133,7 +133,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
order.setPressEndDate(expiredDate); order.setPressEndDate(expiredDate);
order.setOrderGroupId(groupId); order.setOrderGroupId(groupId);
try { try {
wxOrderMapper.updateByPrimaryKey(order);
wxOrderMapper.updateByPrimaryKeySelective(order);
} catch (Exception e) { } catch (Exception e) {
logger.error("更新订单信息失败", e); logger.error("更新订单信息失败", e);
throw new MallinkException(ErrorCode.DB_FAIL); throw new MallinkException(ErrorCode.DB_FAIL);


Cargando…
Cancelar
Guardar