java/mx_charging_pile.git

			@@ -6,6 +6,8 @@
			import com.ruoyi.account.api.dto.GrantCouponDto;
			import com.ruoyi.account.api.feignClient.AppCouponClient;
			import com.ruoyi.account.api.feignClient.AppUserAddressClient;
			import com.ruoyi.account.api.feignClient.AppUserClient;
			import com.ruoyi.account.api.model.TAppUser;
			import com.ruoyi.account.api.model.TAppUserAddress;
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.core.web.domain.AjaxResult;
			@@ -66,6 +68,8 @@

			@Resource
			private CouponClient couponClient;
			@Resource
			private AppUserClient appUserClient;

			@Resource
			private AppUserAddressClient appUserAddressClient;
			@@ -502,7 +506,30 @@
			}
			PageInfo<TShoppingOrder> pageInfo = new PageInfo<>(query.getPageCurr(),query.getPageSize());
			List<TShoppingOrder> list = this.baseMapper.pageList(pageInfo,query,startTime1,startTime2);
			for (TShoppingOrder tShoppingOrder : list) {
			tShoppingOrder.setUid(tShoppingOrder.getId().toString());
			switch (tShoppingOrder.getOrderType()){
			case 1:
			TGoods data = goodsClient.getGoodsById(tShoppingOrder.getGoodsId()).getData();
			if (data!=null){
			tShoppingOrder.setName(data.getName());
			}
			break;
			case 2:
			TCoupon data1 = couponClient.getCouponById1(tShoppingOrder.getCouponId()).getData();
			if (data1!=null){
			tShoppingOrder.setName(data1.getName());
			}
			break;
			}
			if (tShoppingOrder.getAppUserId() != null){
			TAppUser data = appUserClient.getUserById(tShoppingOrder.getAppUserId()).getData();
			if (data!=null){
			tShoppingOrder.setPhone(data.getPhone());
			}
			}

			}
			pageInfo.setRecords(list);
			return pageInfo;
			}