Merge branch 'master' of http://gitea.yxtsoft.com/lipinka/yxt-yythmall-biz

src/main/java/com/yxt/yythmall/biz/lpkreserveorder/LpkReserveOrderMapper.xml

@@ -126,9 +126,9 @@
         d.name as bankName,
         t.goodsSid as goodsSid,
         sum(t.goodsNumber) as goodsNumber,
-        d.linker,
+        s.linker,
-        d.linkPhone,
+        s.phone as linkPhone,
-        d.address,
+        s.address,
         e.`name` as goodsName,
         case o.cardType
         when 1 then '家庭卡'
@@ -155,9 +155,9 @@
         d.name as bankName,
         t.goodsSid as goodsSid,
         sum(t.goodsNumber) as goodsNumber,
-        s.linker,
+        d.linker,
-        s.phone as linkPhone,
+        d.phone as linkPhone,
-        s.address,
+        d.address,
         case o.cardType
         when 1 then '家庭卡'
         when 2 then '亲情卡'
@@ -409,9 +409,9 @@
         d.name as bankName,
         t.goodsSid as goodsSid,
         sum(t.goodsNumber) as goodsNumber,
-        d.linker,
+        s.linker,
-        d.linkPhone,
+        s.phone as linkPhone,
-        d.address,
+        s.address,
         case o.cardType
         when 1 then '家庭卡'
         when 2 then '亲情卡'
@@ -438,9 +438,9 @@
         d.name as bankName,
         t.goodsSid as goodsSid,
         sum(t.goodsNumber) as goodsNumber,
-        s.linker,
+        d.linker,
-        s.phone as linkPhone,
+        d.phone as linkPhone,
-        s.address,
+        d.address,
         case o.cardType
         when 1 then '家庭卡'
         when 2 then '亲情卡'

src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsMapper.java

@@ -5,9 +5,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.yxt.yythmall.api.transferrecords.TransferRecords;
 import com.yxt.yythmall.api.transferrecords.TransferRecordsQuery;
 import com.yxt.yythmall.api.transferrecords.TransferRecordsVo;
-import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrder;
-import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderQuery;
-import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderVo;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;

src/main/java/com/yxt/yythmall/biz/transferrecords/TransferRecordsService.java

@@ -23,9 +23,6 @@ import com.yxt.yythmall.api.transferrecordsgoodsdetails.TransferRecordsGoodsDeta
 import com.yxt.yythmall.api.vegecallerreservedetails.VegeCellarReserveDetails;
 import com.yxt.yythmall.api.vegecallerreserveorder.OrderGoodsVo;
 import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrder;
-import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderQuery;
-import com.yxt.yythmall.api.vegecallerreserveorder.VegeCellarReserveOrderVo;
-import com.yxt.yythmall.api.vegetablecellar.VegetableCellar;
 import com.yxt.yythmall.biz.customerstore.CustomerStoreService;
 import com.yxt.yythmall.biz.lpkgiftcard.LpkGiftCardService;
 import com.yxt.yythmall.biz.lpkgiftcard.generateRule.UniqueIdGenerator;

src/main/java/com/yxt/yythmall/config/SaTokenConfigure.java

@@ -34,6 +34,7 @@ public class SaTokenConfigure implements WebMvcConfigurer {
                 .excludePathPatterns("/empcard/isSaturAndSun/**")
                 .excludePathPatterns("/lpkgiftcard/getReservationBySid/**")
                 .excludePathPatterns("/lpksreservoorder/submission")
+                .excludePathPatterns("/lpksreservoorder/exportExcelByStore")
                 .excludePathPatterns("/lpksreservoorders/submission")
                 .excludePathPatterns("/empsreservoorder/submission")
                 .excludePathPatterns("/empsreservoorder/submissionEmp")