|
@@ -914,7 +914,11 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
}
|
|
|
break;
|
|
|
case 4:
|
|
|
-
|
|
|
+ pinkCriteria.andIn("status", Arrays.asList(0, 0));
|
|
|
+ pinkList = storePinkService.findByCondition(pinkCondition);
|
|
|
+ if (CollUtil.isNotEmpty(pinkList)) {
|
|
|
+ criteria.andIn("id", pinkList.stream().map(StorePink::getOrderIdKey).collect(Collectors.toList()));
|
|
|
+ }
|
|
|
break;
|
|
|
default:
|
|
|
break;
|
|
@@ -1074,19 +1078,13 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
// 校验收货信息
|
|
|
String verifyCode = "";
|
|
|
String userAddressStr = "";
|
|
|
-// if (request.getShippingType() == 1) {
|
|
|
-// // 快递配送
|
|
|
-// if (request.getAddressId() <= 0) {
|
|
|
-// throw new ServiceException("请选择收货地址");
|
|
|
-// }
|
|
|
-// UserAddress userAddress = userAddressService.findById(request.getAddressId());
|
|
|
-// if (ObjectUtil.isNull(userAddress) || userAddress.getIsDelete().equals(1)) {
|
|
|
-// throw new ServiceException("收货地址有误");
|
|
|
-// }
|
|
|
-// request.setRealName(userAddress.getRealName());
|
|
|
-// request.setPhone(userAddress.getPhone());
|
|
|
-// userAddressStr = userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getDetail();
|
|
|
-// }
|
|
|
+
|
|
|
+ UserAddress userAddress = userAddressService.getDefaultByUid(user.getId());
|
|
|
+ if (userAddress != null) {
|
|
|
+ request.setRealName(userAddress.getRealName());
|
|
|
+ request.setPhone(userAddress.getPhone());
|
|
|
+ userAddressStr = userAddress.getProvince() + userAddress.getCity() + userAddress.getDistrict() + userAddress.getDetail();
|
|
|
+ }
|
|
|
|
|
|
// 计算订单各种价格
|
|
|
OrderComputedPriceRequest orderComputedPriceRequest = new OrderComputedPriceRequest();
|
|
@@ -1234,26 +1232,31 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
+ @Transactional
|
|
|
public Boolean goPay(GoPinkDTO dto) {
|
|
|
-// StoreOrder storeOrder = findBy("orderId", dto.getOrderId());
|
|
|
-// // 扣取余额
|
|
|
-// Boolean b = accountDubboServiceClient.checkFee(dto.getUserId(), storeOrder.getPayPrice());
|
|
|
-// if (!b){
|
|
|
-// return Result.fail(ResultCode.INSUFFICIENT_BALANCE);
|
|
|
-// }
|
|
|
-// TransParam transParam = new TransParam();
|
|
|
-// transParam.builder()
|
|
|
-// .setBizId(dto.getOrderId())
|
|
|
-// .setDebitAccount(user.getId())
|
|
|
-// .setCreditAccount();
|
|
|
-// accountDubboServiceClient.trans(transParam);
|
|
|
-//
|
|
|
-// if (storeOrder.getPaid() == 1) {
|
|
|
+ StoreOrder storeOrder = findBy("orderId", dto.getOrderId());
|
|
|
|
|
|
+ // 检验余额够不够
|
|
|
+ storeOrder.setPaid(1);
|
|
|
+ update(storeOrder);
|
|
|
if ("open".equals(dto.getType())) {
|
|
|
+// OpenParam openParam = new OpenParam();
|
|
|
+// openParam.setBizId(storeOrder.getId().toString());
|
|
|
+// openParam.setBizNo(storeOrder.getOrderId());
|
|
|
+// openParam.setUserId(storeOrder.getUid());
|
|
|
+// openParam.setAmount(storeOrder.getPayPrice());
|
|
|
+// openParam.setTransTime(new Date());
|
|
|
+// accountDubboServiceClient.openGroup(openParam);
|
|
|
goOpen(dto.getOrderId());
|
|
|
}
|
|
|
if ("join".equals(dto.getType())) {
|
|
|
+// JoinParam joinParam = new JoinParam();
|
|
|
+// joinParam.setBizId(storeOrder.getId().toString());
|
|
|
+// joinParam.setBizNo(storeOrder.getOrderId());
|
|
|
+// joinParam.setUserId(storeOrder.getUid());
|
|
|
+// joinParam.setAmount(storeOrder.getPayPrice());
|
|
|
+// joinParam.setTransTime(new Date());
|
|
|
+// accountDubboServiceClient.joinGroup(joinParam);
|
|
|
goPink(dto);
|
|
|
}
|
|
|
return true;
|