|
@@ -209,9 +209,10 @@ public class OrderService extends ServiceImpl<OrderMapper, Order> {
|
|
}
|
|
}
|
|
|
|
|
|
public OrderDetailVO getOrderDetail(WeiXinPayDTO weiXinPayDTO) {
|
|
public OrderDetailVO getOrderDetail(WeiXinPayDTO weiXinPayDTO) {
|
|
|
|
+ OrderDetailVO orderDetailVO = new OrderDetailVO();
|
|
|
|
+ orderDetailVO.setPersonVoucherIds(weiXinPayDTO.getPersonVoucherIds());
|
|
Integer type = weiXinPayDTO.getGoodType();
|
|
Integer type = weiXinPayDTO.getGoodType();
|
|
Integer activityId = weiXinPayDTO.getActivityId();
|
|
Integer activityId = weiXinPayDTO.getActivityId();
|
|
- OrderDetailVO orderDetailVO = new OrderDetailVO();
|
|
|
|
List<GoodVO> goodVOS = weiXinPayDTO.getGoods();
|
|
List<GoodVO> goodVOS = weiXinPayDTO.getGoods();
|
|
List<Activity> activities = activityService.getActivities(activityId, type, 0);
|
|
List<Activity> activities = activityService.getActivities(activityId, type, 0);
|
|
PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
|
|
PersonnelVO personnelVO = cacheUtil.getLoginUser(LoginUtils.getToken());
|