|
@@ -181,145 +181,105 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
private DailySalesSummaryOfProductsService dailySalesSummaryOfProductsService;
|
|
private DailySalesSummaryOfProductsService dailySalesSummaryOfProductsService;
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public void goOpen(String orderId) {
|
|
|
|
|
|
|
+ public void goOpen(String orderId,UserDTO user) {
|
|
|
StoreOrder storeOrder = findBy("orderId", orderId);
|
|
StoreOrder storeOrder = findBy("orderId", orderId);
|
|
|
if (storeOrder == null) {
|
|
if (storeOrder == null) {
|
|
|
String s = I18nUtil.get("order.does.not.exist");
|
|
String s = I18nUtil.get("order.does.not.exist");
|
|
|
throw new ServiceException(s + orderId);
|
|
throw new ServiceException(s + orderId);
|
|
|
}
|
|
}
|
|
|
- UserDTO user = userDubboServiceClient.getUser(storeOrder.getUid());
|
|
|
|
|
- StorePink storePink = new StorePink();
|
|
|
|
|
- long storePinkId = IdUtil.getSnowflake(1, 3).nextId();
|
|
|
|
|
- storePink.setId(storePinkId);
|
|
|
|
|
- if (!ObjectUtils.isEmpty(user)) {
|
|
|
|
|
- storePink.setAvatar(user.getHeadPic());
|
|
|
|
|
- storePink.setNickname(user.getName());
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- storePink.setUid(storeOrder.getUid());
|
|
|
|
|
- storePink.setOrderId(storeOrder.getOrderId());
|
|
|
|
|
- storePink.setOrderIdKey(storeOrder.getId());
|
|
|
|
|
- storePink.setTotalNum(storeOrder.getTotalNum());
|
|
|
|
|
- storePink.setTotalPrice(storeOrder.getTotalPrice());
|
|
|
|
|
- StoreCombination storeCombination = storeCombinationService.findById(storeOrder.getCombinationId());
|
|
|
|
|
- storePink.setCid(storeCombination.getId());
|
|
|
|
|
- storePink.setPid(storeCombination.getProductId());
|
|
|
|
|
- storePink.setPeople(storeCombination.getPeople());
|
|
|
|
|
- storePink.setPrice(storeCombination.getPrice());
|
|
|
|
|
- Date date = storeOrder.getCreateTime();
|
|
|
|
|
- Integer effectiveTime = storeCombination.getEffectiveTime();
|
|
|
|
|
- storePink.setAddTime(date);
|
|
|
|
|
- storePink.setStopTime(DateUtils.addMinutes(date, effectiveTime));
|
|
|
|
|
- storePink.setKId(0);
|
|
|
|
|
- storePink.setLId(0);
|
|
|
|
|
- storePink.setUid(storeOrder.getUid());
|
|
|
|
|
- storePink.setIsRefund(0);
|
|
|
|
|
- storePink.setStatus(1);
|
|
|
|
|
- storePink.setOrderStatus(storeOrder.getStatus());
|
|
|
|
|
-
|
|
|
|
|
- // 插入拼团汇总表
|
|
|
|
|
- StorePinkSummary storePinkSummary = new StorePinkSummary();
|
|
|
|
|
- long storePinkSummaryId = IdUtil.getSnowflake(1, 2).nextId();
|
|
|
|
|
- storePinkSummary.setId(storePinkSummaryId);
|
|
|
|
|
- storePinkSummary.setTotalPrice(storeOrder.getTotalPrice());
|
|
|
|
|
- storePinkSummary.setCid(storeCombination.getId());
|
|
|
|
|
- storePinkSummary.setPid(storeCombination.getProductId());
|
|
|
|
|
-
|
|
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
|
|
|
|
|
- String formatted = sdf.format(date);
|
|
|
|
|
- String tgCode = OrderUtils.getTGCode(formatted);
|
|
|
|
|
-
|
|
|
|
|
- storePinkSummary.setCode(tgCode);
|
|
|
|
|
- storePinkSummary.setPeople(storeCombination.getPeople());
|
|
|
|
|
- storePinkSummary.setAddTime(date);
|
|
|
|
|
- Integer effectiveTime1 = storeCombination.getEffectiveTime();
|
|
|
|
|
- Date settleTime = DateUtil.offsetHour(date, effectiveTime1);
|
|
|
|
|
- storePinkSummary.setStopTime(settleTime);
|
|
|
|
|
- storePinkSummary.setIsRefund(0);
|
|
|
|
|
- storePinkSummary.setIsVirtual(Boolean.TRUE); // 初始化时直接锁定,防止团长还没支付这个团就暴露出来了。等团长支付时会重新计算是否锁定
|
|
|
|
|
- storePinkSummary.setPeopleCount(1);
|
|
|
|
|
- storePinkSummary.setStatus(1);
|
|
|
|
|
- List<String> orderNoSet = new ArrayList<>();
|
|
|
|
|
- orderNoSet.add(orderId);
|
|
|
|
|
- String orderNoSetStr = JSONObject.toJSONString(orderNoSet);
|
|
|
|
|
- storePinkSummary.setOrderNoSet(orderNoSetStr);
|
|
|
|
|
- EasyToUseUtil.appCreateAssignment(date, storePinkSummary);
|
|
|
|
|
- storePinkSummaryService.save(storePinkSummary);
|
|
|
|
|
-
|
|
|
|
|
- // 插入拼团详情表
|
|
|
|
|
- storePink.setSpsId(storePinkSummary.getId());
|
|
|
|
|
- storePink.setSpsCode(storePinkSummary.getCode());
|
|
|
|
|
- EasyToUseUtil.appCreateAssignment(date, storePink);
|
|
|
|
|
- storePinkService.save(storePink);
|
|
|
|
|
-
|
|
|
|
|
- // 插入每日统计表
|
|
|
|
|
- dailySalesSummaryOfProductsService.saveDailySalesSummaryOfProducts(storePink);
|
|
|
|
|
|
|
+// UserDTO user = userDubboServiceClient.getUser(storeOrder.getUid());
|
|
|
|
|
+ afterGoOpen(storeOrder,user);
|
|
|
|
|
+ }
|
|
|
|
|
|
|
|
- // 如果是开团,需要更新订单数据
|
|
|
|
|
- storeOrder.setPinkId(storePink.getId());
|
|
|
|
|
|
|
|
|
|
- Example exampleStoreOrder = new Example(StoreOrder.class);
|
|
|
|
|
- exampleStoreOrder.createCriteria().andEqualTo("orderId", orderId);
|
|
|
|
|
- storeOrder.setOrderId(null);
|
|
|
|
|
- storeOrder.setCreateTime(null);
|
|
|
|
|
- storeOrder.setUid(null);
|
|
|
|
|
-
|
|
|
|
|
- storeOrderMapper.updateByConditionSelective(storeOrder, exampleStoreOrder);
|
|
|
|
|
- // 先清空分片建再设置回去传递到后面,因为分片建不允许更新
|
|
|
|
|
- storeOrder.setOrderId(orderId);
|
|
|
|
|
- // 分库分表后下面的修改方式已经不合适了换上上面的方式
|
|
|
|
|
- // update(storeOrder);
|
|
|
|
|
|
|
+ /**
|
|
|
|
|
+ *
|
|
|
|
|
+ * @param storeOrder
|
|
|
|
|
+ * @param user
|
|
|
|
|
+ */
|
|
|
|
|
+ private void afterGoOpen(StoreOrder storeOrder,UserDTO user) {
|
|
|
|
|
+ StorePink storePink = new StorePink();
|
|
|
|
|
+ long storePinkId = IdUtil.getSnowflake(1, 3).nextId();
|
|
|
|
|
+ storePink.setId(storePinkId);
|
|
|
|
|
+ if (!ObjectUtils.isEmpty(user)) {
|
|
|
|
|
+ storePink.setAvatar(user.getHeadPic());
|
|
|
|
|
+ storePink.setNickname(user.getName());
|
|
|
|
|
+ }
|
|
|
|
|
+ storePink.setUid(storeOrder.getUid());
|
|
|
|
|
+ storePink.setOrderId(storeOrder.getOrderId());
|
|
|
|
|
+ storePink.setOrderIdKey(storeOrder.getId());
|
|
|
|
|
+ storePink.setTotalNum(storeOrder.getTotalNum());
|
|
|
|
|
+ storePink.setTotalPrice(storeOrder.getTotalPrice());
|
|
|
|
|
+ StoreCombination storeCombination = storeCombinationService.findById(storeOrder.getCombinationId());
|
|
|
|
|
+ storePink.setCid(storeCombination.getId());
|
|
|
|
|
+ storePink.setPid(storeCombination.getProductId());
|
|
|
|
|
+ storePink.setPeople(storeCombination.getPeople());
|
|
|
|
|
+ storePink.setPrice(storeCombination.getPrice());
|
|
|
|
|
+ Date date = storeOrder.getCreateTime();
|
|
|
|
|
+ Integer effectiveTime = storeCombination.getEffectiveTime();
|
|
|
|
|
+ storePink.setAddTime(date);
|
|
|
|
|
+ storePink.setStopTime(DateUtils.addMinutes(date, effectiveTime));
|
|
|
|
|
+ storePink.setKId(0);
|
|
|
|
|
+ storePink.setLId(0);
|
|
|
|
|
+ storePink.setUid(storeOrder.getUid());
|
|
|
|
|
+ storePink.setIsRefund(0);
|
|
|
|
|
+ storePink.setStatus(1);
|
|
|
|
|
+ storePink.setOrderStatus(storeOrder.getStatus());
|
|
|
|
|
+
|
|
|
|
|
+ // 插入拼团汇总表
|
|
|
|
|
+ StorePinkSummary storePinkSummary = new StorePinkSummary();
|
|
|
|
|
+ long storePinkSummaryId = IdUtil.getSnowflake(1, 2).nextId();
|
|
|
|
|
+ storePinkSummary.setId(storePinkSummaryId);
|
|
|
|
|
+ storePinkSummary.setTotalPrice(storeOrder.getTotalPrice());
|
|
|
|
|
+ storePinkSummary.setCid(storeCombination.getId());
|
|
|
|
|
+ storePinkSummary.setPid(storeCombination.getProductId());
|
|
|
|
|
+
|
|
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat("yyMMdd");
|
|
|
|
|
+ String formatted = sdf.format(date);
|
|
|
|
|
+ String tgCode = OrderUtils.getTGCode(formatted);
|
|
|
|
|
+
|
|
|
|
|
+ storePinkSummary.setCode(tgCode);
|
|
|
|
|
+ storePinkSummary.setPeople(storeCombination.getPeople());
|
|
|
|
|
+ storePinkSummary.setAddTime(date);
|
|
|
|
|
+ Integer effectiveTime1 = storeCombination.getEffectiveTime();
|
|
|
|
|
+ Date settleTime = DateUtil.offsetHour(date, effectiveTime1);
|
|
|
|
|
+ storePinkSummary.setStopTime(settleTime);
|
|
|
|
|
+ storePinkSummary.setIsRefund(0);
|
|
|
|
|
+ storePinkSummary.setIsVirtual(Boolean.TRUE); // 初始化时直接锁定,防止团长还没支付这个团就暴露出来了。等团长支付时会重新计算是否锁定
|
|
|
|
|
+ storePinkSummary.setPeopleCount(1);
|
|
|
|
|
+ storePinkSummary.setStatus(1);
|
|
|
|
|
+ List<String> orderNoSet = new ArrayList<>();
|
|
|
|
|
+ orderNoSet.add(storeOrder.getOrderId());
|
|
|
|
|
+ String orderNoSetStr = JSONObject.toJSONString(orderNoSet);
|
|
|
|
|
+ storePinkSummary.setOrderNoSet(orderNoSetStr);
|
|
|
|
|
+ EasyToUseUtil.appCreateAssignment(date, storePinkSummary,user);
|
|
|
|
|
+ storePinkSummaryService.save(storePinkSummary);
|
|
|
|
|
+
|
|
|
|
|
+ // 插入拼团详情表
|
|
|
|
|
+ storePink.setSpsId(storePinkSummary.getId());
|
|
|
|
|
+ storePink.setSpsCode(storePinkSummary.getCode());
|
|
|
|
|
+ EasyToUseUtil.appCreateAssignment(date, storePink,user);
|
|
|
|
|
+ storePinkService.save(storePink);
|
|
|
|
|
+ // 插入每日统计表
|
|
|
|
|
+ dailySalesSummaryOfProductsService.saveDailySalesSummaryOfProducts(storePink);
|
|
|
|
|
+ StoreOrder upStoreOrder = new StoreOrder();
|
|
|
|
|
+ // 如果是开团,需要更新订单数据
|
|
|
|
|
+ upStoreOrder.setPinkId(storePink.getId());
|
|
|
|
|
+ Example exampleStoreOrder = new Example(StoreOrder.class);
|
|
|
|
|
+ exampleStoreOrder.createCriteria().andEqualTo("orderId", storeOrder.getOrderId());
|
|
|
|
|
+ storeOrderMapper.updateByConditionSelective(upStoreOrder, exampleStoreOrder);
|
|
|
|
|
+ // 先清空分片建再设置回去传递到后面,因为分片建不允许更新
|
|
|
|
|
+ storeOrder.setOrderId(storeOrder.getOrderId());
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- // @Override
|
|
|
|
|
- // public void goPink(GoPinkDTO dto) {
|
|
|
|
|
- // Date date = new Date();
|
|
|
|
|
- // if (dto.getPinkId() == null && dto.getCid() != null) {
|
|
|
|
|
- // automaticMatch(dto);
|
|
|
|
|
- // }
|
|
|
|
|
- // if (dto.getPinkId() != null) {
|
|
|
|
|
- // StorePink teamPink = storePinkService.findById(dto.getPinkId());
|
|
|
|
|
- // if (ObjectUtil.isNull(teamPink) || teamPink.getIsRefund().equals(1)) {
|
|
|
|
|
- // throw new ServiceException(I18nUtil.get("the.corresponding.group.buying.does.not.exist"));
|
|
|
|
|
- // }
|
|
|
|
|
- // Condition condition = new Condition(StoreCombination.class);
|
|
|
|
|
- // Example.Criteria criteria = condition.createCriteria();
|
|
|
|
|
- // criteria.andEqualTo("isDelete", 0);
|
|
|
|
|
- // criteria.andEqualTo("isShow", 1);
|
|
|
|
|
- // criteria.andEqualTo("id", dto.getCid());
|
|
|
|
|
- // criteria.andLessThanOrEqualTo("startTime", date);
|
|
|
|
|
- // criteria.andGreaterThanOrEqualTo("stopTime", date);
|
|
|
|
|
- //
|
|
|
|
|
- // List<StoreCombination> combinationList = storeCombinationService.findByCondition(condition);
|
|
|
|
|
- // if (CollUtil.isEmpty(combinationList)) {
|
|
|
|
|
- // throw new ServiceException(I18nUtil.get("group.buying.product.does.not.exist.or.is.not.activated"));
|
|
|
|
|
- // }
|
|
|
|
|
- //
|
|
|
|
|
- // Condition pinkCondition = new Condition(StorePink.class);
|
|
|
|
|
- // Example.Criteria pinkCriteria = pinkCondition.createCriteria();
|
|
|
|
|
- // pinkCriteria.andEqualTo("isDelete", 0);
|
|
|
|
|
- // pinkCriteria.andEqualTo("spsId", dto.getSpsId());
|
|
|
|
|
- // pinkCriteria.andEqualTo("status", 1);
|
|
|
|
|
- // List<StorePink> pinkList = storePinkService.findByCondition(pinkCondition);
|
|
|
|
|
- // int count = teamPink.getPeople() - (CollUtil.isEmpty(pinkList) ? 0 : pinkList.size());
|
|
|
|
|
- // if (count < 1) {
|
|
|
|
|
- // throw new ServiceException(I18nUtil.get("group.buying.is.full"));
|
|
|
|
|
- // }
|
|
|
|
|
- // List<Long> uidList = pinkList.stream().map(StorePink::getUid).collect(Collectors.toList());
|
|
|
|
|
- // if (uidList.contains(dto.getUserId())) {
|
|
|
|
|
- // throw new ServiceException("您已加入该拼团");
|
|
|
|
|
- // }
|
|
|
|
|
- // joinGroup(teamPink, dto, count,pinkList.size());
|
|
|
|
|
- // }
|
|
|
|
|
- // }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@Override
|
|
@Override
|
|
|
- public void goPink(GoPinkDTO dto) {
|
|
|
|
|
|
|
+ public void goPink(GoPinkDTO dto, UserDTO user) {
|
|
|
dto.setPinkId(null);
|
|
dto.setPinkId(null);
|
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
|
if (dto.getPinkId() == null && dto.getCid() != null) {
|
|
if (dto.getPinkId() == null && dto.getCid() != null) {
|
|
|
- automaticMatch(dto);
|
|
|
|
|
|
|
+ automaticMatch(dto,user);
|
|
|
}
|
|
}
|
|
|
if (dto.getPinkId() != null) {
|
|
if (dto.getPinkId() != null) {
|
|
|
StorePink teamPink = storePinkService.findById(dto.getPinkId());
|
|
StorePink teamPink = storePinkService.findById(dto.getPinkId());
|
|
@@ -355,24 +315,13 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
if (uidList.contains(dto.getUserId())) {
|
|
if (uidList.contains(dto.getUserId())) {
|
|
|
throw new ServiceException(I18nUtil.get("duplicate.group.buying"));
|
|
throw new ServiceException(I18nUtil.get("duplicate.group.buying"));
|
|
|
}
|
|
}
|
|
|
- joinGroup(teamPink, dto, count, pinkList.size());
|
|
|
|
|
|
|
+ joinGroup(teamPink, dto, user);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
- private void joinGroup(StorePink teamPink, GoPinkDTO dto, int count, int pinkSize) {
|
|
|
|
|
|
|
+ private void joinGroup(StorePink teamPink, GoPinkDTO dto, UserDTO user) {
|
|
|
// 拼团剩余人数
|
|
// 拼团剩余人数
|
|
|
Date date = new Date();
|
|
Date date = new Date();
|
|
|
-
|
|
|
|
|
- // 修改拼团汇总表 这块得上分布式锁 这块不需要了,会去 maintainQuantityStatusOfTheStorePinkSummary幂等时时维护 汇总表的拼团状态和拼团数量的
|
|
|
|
|
- // StorePinkSummary storePinkSummary = new StorePinkSummary();
|
|
|
|
|
- // storePinkSummary.setId(dto.getSpsId());
|
|
|
|
|
- // storePinkSummary.setPeopleCount(pinkSize+1);
|
|
|
|
|
- // EasyToUseUtil.appCreateAssignment(date,storePinkSummary);
|
|
|
|
|
- // if (count == 1) {
|
|
|
|
|
- // storePinkSummary.setStatus(1);
|
|
|
|
|
- // }
|
|
|
|
|
- // storePinkSummaryService.update(storePinkSummary);
|
|
|
|
|
-
|
|
|
|
|
// 加入拼团
|
|
// 加入拼团
|
|
|
StorePink storePink = new StorePink();
|
|
StorePink storePink = new StorePink();
|
|
|
BeanUtils.copyProperties(teamPink, storePink);
|
|
BeanUtils.copyProperties(teamPink, storePink);
|
|
@@ -388,7 +337,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
storePink.setIsRefund(0);
|
|
storePink.setIsRefund(0);
|
|
|
storePink.setKId(1);
|
|
storePink.setKId(1);
|
|
|
storePink.setSpsCode(dto.getSpsCode());
|
|
storePink.setSpsCode(dto.getSpsCode());
|
|
|
- UserDTO user = userDubboServiceClient.getUser(dto.getUserId());
|
|
|
|
|
|
|
+// UserDTO user = userDubboServiceClient.getUser(dto.getUserId());
|
|
|
if (!ObjectUtils.isEmpty(user)) {
|
|
if (!ObjectUtils.isEmpty(user)) {
|
|
|
storePink.setUid(dto.getUserId());
|
|
storePink.setUid(dto.getUserId());
|
|
|
storePink.setAvatar(user.getHeadPic());
|
|
storePink.setAvatar(user.getHeadPic());
|
|
@@ -410,24 +359,12 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
Condition storeOrderCondition = new Condition(StoreOrder.class);
|
|
Condition storeOrderCondition = new Condition(StoreOrder.class);
|
|
|
storeOrderCondition.createCriteria().andEqualTo("orderId", dto.getOrderId());
|
|
storeOrderCondition.createCriteria().andEqualTo("orderId", dto.getOrderId());
|
|
|
storeOrderMapper.updateByConditionSelective(storeOrder, storeOrderCondition);
|
|
storeOrderMapper.updateByConditionSelective(storeOrder, storeOrderCondition);
|
|
|
- //**分库整改
|
|
|
|
|
- // update(storeOrder);
|
|
|
|
|
- // if(!b){
|
|
|
|
|
- // throw new ServiceException("拼团超员请选择新的拼团");
|
|
|
|
|
- // }
|
|
|
|
|
-
|
|
|
|
|
- // if (count == 1) {
|
|
|
|
|
- // storePinkService.pinkSuccess(teamPink.getId());
|
|
|
|
|
- //
|
|
|
|
|
- // // 考虑是否回写主订单
|
|
|
|
|
- //
|
|
|
|
|
- // }
|
|
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 自动匹配
|
|
* 自动匹配
|
|
|
*/
|
|
*/
|
|
|
- private void automaticMatch(GoPinkDTO dto) {
|
|
|
|
|
|
|
+ private void automaticMatch(GoPinkDTO dto, UserDTO user) {
|
|
|
// 找一个最快能成团的
|
|
// 找一个最快能成团的
|
|
|
StoreCombination storeCombination = storeCombinationService.findById(dto.getCid());
|
|
StoreCombination storeCombination = storeCombinationService.findById(dto.getCid());
|
|
|
if (ObjectUtil.isNull(storeCombination) || storeCombination.getIsDelete().equals(1)) {
|
|
if (ObjectUtil.isNull(storeCombination) || storeCombination.getIsDelete().equals(1)) {
|
|
@@ -518,7 +455,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
if (count > 0) {
|
|
if (count > 0) {
|
|
|
dto.setSpsId(pink.getSpsId()); // 拼团汇总表id
|
|
dto.setSpsId(pink.getSpsId()); // 拼团汇总表id
|
|
|
dto.setSpsCode(pink.getSpsCode()); // 拼团汇总表code
|
|
dto.setSpsCode(pink.getSpsCode()); // 拼团汇总表code
|
|
|
- joinGroup(pink, dto, count, pinkList.size());
|
|
|
|
|
|
|
+ joinGroup(pink, dto,user);
|
|
|
} else {
|
|
} else {
|
|
|
throw new ServiceException(I18nUtil.get("the.number.of.group.buying.participants.exceeds.the.limit.please.initiate.group.buying.again.pinkid") + pink.getId());
|
|
throw new ServiceException(I18nUtil.get("the.number.of.group.buying.participants.exceeds.the.limit.please.initiate.group.buying.again.pinkid") + pink.getId());
|
|
|
}
|
|
}
|
|
@@ -1818,7 +1755,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
// 处理拼团逻辑
|
|
// 处理拼团逻辑
|
|
|
private void handleGroupPurchase(CreateOrderRequest request, StoreOrder storeOrder, UserDTO user) {
|
|
private void handleGroupPurchase(CreateOrderRequest request, StoreOrder storeOrder, UserDTO user) {
|
|
|
if ("open".equals(request.getType())) {
|
|
if ("open".equals(request.getType())) {
|
|
|
- goOpen(storeOrder.getOrderId());
|
|
|
|
|
|
|
+ afterGoOpen(storeOrder,user);
|
|
|
}
|
|
}
|
|
|
if ("join".equals(request.getType())) {
|
|
if ("join".equals(request.getType())) {
|
|
|
GoPinkDTO goPinkDTO = new GoPinkDTO();
|
|
GoPinkDTO goPinkDTO = new GoPinkDTO();
|
|
@@ -1828,7 +1765,7 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
|
|
|
goPinkDTO.setSpsId(request.getSpsId());
|
|
goPinkDTO.setSpsId(request.getSpsId());
|
|
|
goPinkDTO.setPinkId(request.getPinkId());
|
|
goPinkDTO.setPinkId(request.getPinkId());
|
|
|
goPinkDTO.setUserId(user.getId());
|
|
goPinkDTO.setUserId(user.getId());
|
|
|
- goPink(goPinkDTO);
|
|
|
|
|
|
|
+ goPink(goPinkDTO, user);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|