|
@@ -87,8 +87,11 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
|
|
|
|
|
|
@Override
|
|
|
- public void goOpen(Long orderId) {
|
|
|
- StoreOrder storeOrder = findById(orderId);
|
|
|
+ public void goOpen(String orderId) {
|
|
|
+ StoreOrder storeOrder = findBy("orderId", orderId);
|
|
|
+ if (storeOrder == null) {
|
|
|
+ throw new ServiceException("订单不存在");
|
|
|
+ }
|
|
|
StorePink storePink = new StorePink();
|
|
|
// storePink.setUid(user.getUid());
|
|
|
// storePink.setAvatar(user.getAvatar());
|
|
@@ -1145,7 +1148,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public Boolean goPay(Long orderId) {
|
|
|
+ public Boolean goPay(GoPinkDTO dto) {
|
|
|
// 扣取余额
|
|
|
// accountDubboServiceClient.recharge()
|
|
|
// Boolean b = accountDubboServiceClient.checkFee(user.getId(), storeOrder.getPayPrice());
|
|
@@ -1155,7 +1158,13 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
//
|
|
|
// StoreOrder storeOrder = findById(orderId);
|
|
|
// if (storeOrder.getPaid() == 1) {
|
|
|
- goOpen(orderId);
|
|
|
+
|
|
|
+ if ("open".equals(dto.getType())) {
|
|
|
+ goOpen(dto.getOrderId());
|
|
|
+ }
|
|
|
+ if ("join".equals(dto.getType())) {
|
|
|
+ goPink(dto);
|
|
|
+ }
|
|
|
return true;
|
|
|
// } else {
|
|
|
// return false;
|