|
@@ -10,10 +10,7 @@ import com.caimei365.order.mapper.OrderClubMapper;
|
|
import com.caimei365.order.mapper.OrderCommonMapper;
|
|
import com.caimei365.order.mapper.OrderCommonMapper;
|
|
import com.caimei365.order.model.ResponseJson;
|
|
import com.caimei365.order.model.ResponseJson;
|
|
import com.caimei365.order.model.enums.OrderStatus;
|
|
import com.caimei365.order.model.enums.OrderStatus;
|
|
-import com.caimei365.order.model.po.BalanceRecordPo;
|
|
|
|
-import com.caimei365.order.model.po.OrderPo;
|
|
|
|
-import com.caimei365.order.model.po.OrderProductPo;
|
|
|
|
-import com.caimei365.order.model.po.UserBeansHistoryPo;
|
|
|
|
|
|
+import com.caimei365.order.model.po.*;
|
|
import com.caimei365.order.model.vo.*;
|
|
import com.caimei365.order.model.vo.*;
|
|
import com.caimei365.order.service.RemoteCallService;
|
|
import com.caimei365.order.service.RemoteCallService;
|
|
import com.caimei365.order.service.OrderClubService;
|
|
import com.caimei365.order.service.OrderClubService;
|
|
@@ -212,8 +209,6 @@ public class OrderClubServiceImpl implements OrderClubService {
|
|
return ResponseJson.success(map);
|
|
return ResponseJson.success(map);
|
|
}
|
|
}
|
|
|
|
|
|
-
|
|
|
|
-
|
|
|
|
/**
|
|
/**
|
|
* 机构确认订单
|
|
* 机构确认订单
|
|
*
|
|
*
|
|
@@ -226,6 +221,16 @@ public class OrderClubServiceImpl implements OrderClubService {
|
|
// 非待确认订单
|
|
// 非待确认订单
|
|
return ResponseJson.error("订单异常!", null);
|
|
return ResponseJson.error("订单异常!", null);
|
|
}
|
|
}
|
|
|
|
+ if (MathUtil.compare(order.getCouponAmount(), 0) > 0) {
|
|
|
|
+ // 确认订单时才真正使用优惠券
|
|
|
|
+ CouponOrderRecordPo couponOrderRecord = orderClubMapper.getOrderCouponRecord(orderId);
|
|
|
|
+ CouponVo coupon = orderClubMapper.getClubCouponById(couponOrderRecord.getClubCouponId());
|
|
|
|
+ if (coupon == null) {
|
|
|
|
+ return ResponseJson.error("订单内优惠券已被使用", null);
|
|
|
|
+ } else {
|
|
|
|
+ orderClubMapper.updateCouponClubStatus(couponOrderRecord.getClubCouponId(), orderId);
|
|
|
|
+ }
|
|
|
|
+ }
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
|
|
String curDateStr = (new SimpleDateFormat("yyyy-MM-dd HH:mm:ss")).format(date);
|
|
String note = "【确认订单】";
|
|
String note = "【确认订单】";
|