|
@@ -3,6 +3,7 @@ package com.iamberry.wechat.service.order.dao.impl;
|
|
|
import java.util.List;
|
|
|
|
|
|
import com.iamberry.wechat.core.entity.cart.ShopSalesOrderDto;
|
|
|
+import com.iamberry.wechat.core.entity.coupon.CouponItem;
|
|
|
import com.iamberry.wechat.core.entity.eo.GiftPool;
|
|
|
import com.iamberry.wechat.core.entity.eo.ItemGift;
|
|
|
import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
|
|
@@ -45,6 +46,8 @@ public class AdminOrderDaoImpl implements AdminOrderDao {
|
|
|
private IntegralLogService integralLogService;
|
|
|
@Autowired
|
|
|
private MemberService memberService;
|
|
|
+ @Autowired
|
|
|
+ private CouponItemMapper couponItemMapper;
|
|
|
|
|
|
|
|
|
@Override
|
|
@@ -291,16 +294,18 @@ public class AdminOrderDaoImpl implements AdminOrderDao {
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-// //恢复vip买一增一优惠
|
|
|
-// if(ssod.getSalesVipPreferential() == 1){
|
|
|
-// Member member = new Member();
|
|
|
-// member.setUserOpenid(ssod.getSalesOpenid());
|
|
|
-// member.setUserVipPreferential(1);
|
|
|
-// flag = memberService.nowUpdateUserByOpenId(member);
|
|
|
-// if(flag < 1){
|
|
|
-// throw new RuntimeException("修改用户失败买一赠一失败");
|
|
|
-// }
|
|
|
-// }
|
|
|
+ //恢复优惠券
|
|
|
+ if (null != ssod.getSalesCouponReceiveId() && !"".equals(ssod.getSalesCouponReceiveId())) {
|
|
|
+ CouponItem couponItem = new CouponItem();
|
|
|
+ couponItem.setCouponItemId(ssod.getSalesCouponReceiveId());
|
|
|
+ couponItem.setCouponItemUseropenid(ssod.getSalesOpenid());
|
|
|
+ couponItem.setCouponUseStatus(1);
|
|
|
+ couponItem.setOldCouponUseStatus(7);
|
|
|
+ flag = couponItemMapper.updateCouponItemById(couponItem);
|
|
|
+ if(flag < 1){
|
|
|
+ throw new RuntimeException("恢复优惠券失败");
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
//恢复积分
|
|
|
flag = integralLogService.cancelSurplusIntegral(salesOrderid);
|