java/qijisheng.git

			@@ -1,8 +1,11 @@
			package com.ruoyi.order.vo;

			import com.fasterxml.jackson.annotation.JsonFormat;
			import io.swagger.annotations.ApiModel;
			import io.swagger.annotations.ApiModelProperty;
			import lombok.Data;

			import java.time.LocalDateTime;

			/**
			* @author zhibing.pu
			@@ -20,7 +23,8 @@
			@ApiModelProperty("联系电话")
			private String phone;
			@ApiModelProperty("申请时间")
			private String createTime;
			@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
			private LocalDateTime createTime;
			@ApiModelProperty("售后类型（1退货退款2仅退款）")
			private Integer refundMethod;
			@ApiModelProperty("申请原因")

			@@ -8,7 +8,7 @@
			a.id,
			b.order_number as orderNumber,
			b.app_user_id as appUserId,
			DATE_FORMAT(a.create_time, '%Y-%m-%d %H:%m:%s') as createTime,
			a.create_time as createTime,
			a.refund_method as refundMethod,
			a.refund_reason as refundReason,
			a.pass_status as passStatus,

			@@ -216,9 +216,10 @@
			// 查询有没有门店绑定这个被删除的门店
			List<Shop> shops = shopService.lambdaQuery().eq(Shop::getPid, shop.getId()).list();
			for (Shop shop1 : shops) {
			shop1.setPid(0);
			LambdaUpdateWrapper<Shop> set = new LambdaUpdateWrapper<Shop>().set(Shop::getPid, null)
			.eq(Shop::getId,shop1.getId());
			shopService.update(set);
			}
			shopService.updateBatchById(shops);
			appUserClient.clearBindShop(shop.getId());
			UserShop userShop = new UserShop();
			userShop.setShopId(shop.getId());

	ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderRefundPassList.java	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-order/src/main/resources/mapper/order/RefundPassMapper.xml	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/ShopController.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史