java/qijisheng.git

			@@ -83,6 +83,9 @@
			@ApiModelProperty(value = "技师名称")
			private String technicianName;

			@ApiModelProperty(value = "技师id")
			private Integer technicianId;

			@ApiModelProperty(value = "预约单id")
			private String technicianSubscribeId;

			@@ -52,7 +52,7 @@
			}
			List<CouponInfo> couponInfoList = couponInfoClient.getCouponInfoList(couponIds).getData();
			//构建返回数据
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
			DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy.MM.dd HH:mm");
			List<PaymentUserCouponVo> infoVoList = new ArrayList<>();
			for (UserCoupon userCoupon : list) {
			CouponInfo couponInfo = couponInfoList.stream().filter(s -> s.getId().equals(userCoupon.getCouponId())).findFirst().get();
			@@ -68,9 +68,9 @@
			couponInfoVo.setDiscountAmount(couponInfo.getDiscountAmount());
			couponInfoVo.setMoneyAmount(couponInfo.getMoneyAmount());
			couponInfoVo.setDiscount(couponInfo.getDiscount());
			if(null != couponInfo.getPeriodStartTime()){
			couponInfoVo.setPeriodStartTime(couponInfo.getPeriodStartTime().atTime(0, 0, 0).format(formatter));
			couponInfoVo.setPeriodEndTime(couponInfo.getPeriodEndTime().atTime(23, 59, 59).format(formatter));
			if(null != userCoupon.getStartTime()){
			couponInfoVo.setPeriodStartTime(userCoupon.getStartTime().format(formatter));
			couponInfoVo.setPeriodEndTime(userCoupon.getEndTime().format(formatter));
			}
			String forGoodIds = couponInfo.getForGoodIds();
			String[] split = forGoodIds.split(",");

			@@ -214,6 +214,7 @@
			orderDetailVO.setLatitude(shop.getLatitude());
			orderDetailVO.setShopId(shop.getId());
			orderDetailVO.setTechnicianName(technician.getName());
			orderDetailVO.setTechnicianId(technician.getId());
			return orderDetailVO;
			}

			@@ -93,7 +93,7 @@
			}

			Shop shop = shopMapper.selectById(appUser.getShopId());
			if(null != shop){
			if(null != shop && shop.getDelFlag() == 0 && shop.getStatus() == 1){
			NearbyShopVO vo = new NearbyShopVO();
			vo.setId(appUser.getShopId().longValue());
			vo.setName(shop.getName());

			@@ -28,7 +28,7 @@
			(select ROUND(AVG(score), 1) from t_shop_score where shop_id = ts.id) as score
			FROM
			t_shop ts
			WHERE ts.del_flag = 0 AND ts.`status` = 1 AND ts.id = #{shopId}
			WHERE ts.del_flag = 0 AND ts.id = #{shopId}
			</select>
			<select id="selectShopList" resultType="com.ruoyi.other.api.domain.Shop">
			SELECT

	ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/vo/OrderDetailVO.java	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/service/impl/UserCouponServiceImpl.java	8 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/OrderServiceImpl.java	1 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/service/impl/ShopServiceImpl.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/resources/mapper/other/ShopMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史