|
|
|
@@ -26,7 +26,6 @@ import java.util.Date; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
@Service |
|
|
|
@AllArgsConstructor |
|
|
|
@@ -1014,11 +1013,12 @@ public class PosServiceImpl implements PosService { |
|
|
|
couponOrder.setId(couponOrderCVo.getId()); |
|
|
|
couponOrder.setTenantId(couponOrderCVo.getTenantId()); |
|
|
|
couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 |
|
|
|
if (actionType.equals(EnumVerifyActionType.VERIFY_PAY)) { |
|
|
|
if (couponOrderCVo.getCouponOrderStatus().equals(EnumCouponOrderStatus.POS_PRE_VERIFY.getCode()) && |
|
|
|
actionType.equals(EnumVerifyActionType.VERIFY_PAY)) { |
|
|
|
couponOrder.setBUserId(buUserId); |
|
|
|
} |
|
|
|
couponOrder.setUpdateDate(new Date()); |
|
|
|
if (actionType.equals(EnumVerifyActionType.VERIFY_INDEPENT)) { |
|
|
|
if (couponOrder.getBUserId() == null) { |
|
|
|
num = couponOrderMapper.updateVerifyCouponOrder(couponOrder); |
|
|
|
} else { |
|
|
|
num = couponOrderMapper.updateVerifyCouponOrderStatus(couponOrder); |
|
|
|
|