Commit 13e510a1 by huluobin

# update

parent 4dfdcec4
...@@ -4,6 +4,7 @@ package com.gogirl.infrastructure.mapper.product.serve; ...@@ -4,6 +4,7 @@ package com.gogirl.infrastructure.mapper.product.serve;
import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.gogirl.domain.product.serve.BaseProduce; import com.gogirl.domain.product.serve.BaseProduce;
import com.gogirl.shared.product.BaseProduceDto;
import com.gogirl.shared.product.CalcServiceDuration; import com.gogirl.shared.product.CalcServiceDuration;
import com.gogirl.shared.product.serve.QueryProducePageRequest; import com.gogirl.shared.product.serve.QueryProducePageRequest;
import org.apache.ibatis.annotations.Param; import org.apache.ibatis.annotations.Param;
...@@ -48,4 +49,6 @@ public interface BaseProduceMapper extends BaseMapper<BaseProduce> { ...@@ -48,4 +49,6 @@ public interface BaseProduceMapper extends BaseMapper<BaseProduce> {
void syncSalesNum(); void syncSalesNum();
List<CalcServiceDuration> queryProduceServiceDuration(); List<CalcServiceDuration> queryProduceServiceDuration();
List<BaseProduceDto> exportBaseProduce();
} }
package com.gogirl.shared.product;
import com.alibaba.excel.annotation.ExcelProperty;
import lombok.Data;
import java.math.BigDecimal;
/**
* <p>
*
* </p>
*
* @author robbendev
* @since 2021/1/23 5:02 下午
*/
@Data
public class BaseProduceDto {
@ExcelProperty("款式名称")
private String name;
@ExcelProperty("服务名称")
private String serveName;
@ExcelProperty("服务类型")
private String serveType;
@ExcelProperty("服务时常")
private Integer serviceDuration;
@ExcelProperty("现价")
private BigDecimal currentPrice;
@ExcelProperty("原价")
private BigDecimal bargainPrice;
@ExcelProperty("1-上线 2-下线")
private String status;
}
...@@ -162,5 +162,18 @@ ...@@ -162,5 +162,18 @@
where t3.duration is not null where t3.duration is not null
</select> </select>
<select id="exportBaseProduce" resultType="com.gogirl.shared.product.BaseProduceDto">
select t1.`name`,
t2.`name` serve_name,
t2.type serve_type,
t1.service_duration,
t1.current_price,
t1.bargain_price,
if(t1.`status`=1,'上架','下架') `status`
from base_produce t1
left join base_serve t2 on t1.service_id = t2.id
where t1.`status` !=4 and t2.id is not null
</select>
</mapper> </mapper>
...@@ -68,7 +68,7 @@ ...@@ -68,7 +68,7 @@
<if test="baseServe.departmentId != null "> <if test="baseServe.departmentId != null ">
and t3.store_id = #{baseServe.departmentId} and t3.store_id = #{baseServe.departmentId}
</if> </if>
<if test="sourceFrom!=null and sourceFrom !=''"> <if test="sourceFrom!=null and sourceFrom ='customer'">
and ser.name not in ( and ser.name not in (
'日式女士基础修手', '日式女士基础修手',
'日式女士基础修脚', '日式女士基础修脚',
......
...@@ -36,6 +36,7 @@ import com.gogirl.domain.user.customer.CustomerBalance; ...@@ -36,6 +36,7 @@ import com.gogirl.domain.user.customer.CustomerBalance;
import com.gogirl.domain.user.customer.CustomerBalanceRecord; import com.gogirl.domain.user.customer.CustomerBalanceRecord;
import com.gogirl.infrastructure.common.util.JsonUtilByFsJson; import com.gogirl.infrastructure.common.util.JsonUtilByFsJson;
import com.gogirl.infrastructure.common.util.SessionUtils; import com.gogirl.infrastructure.common.util.SessionUtils;
import com.gogirl.infrastructure.common.util.SpringBeanUtils;
import com.gogirl.infrastructure.mapper.common.xcx.TimeNodeMapper; import com.gogirl.infrastructure.mapper.common.xcx.TimeNodeMapper;
import com.gogirl.infrastructure.mapper.common.xcx.WeekConfigMapper; import com.gogirl.infrastructure.mapper.common.xcx.WeekConfigMapper;
import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper; import com.gogirl.infrastructure.mapper.market.coupon.CouponCustomerRelevanceMapper;
...@@ -50,6 +51,7 @@ import com.gogirl.infrastructure.mapper.product.mall.MallProductMapper; ...@@ -50,6 +51,7 @@ import com.gogirl.infrastructure.mapper.product.mall.MallProductMapper;
import com.gogirl.infrastructure.mapper.product.purchase.PurchaseSkuMapper; import com.gogirl.infrastructure.mapper.product.purchase.PurchaseSkuMapper;
import com.gogirl.infrastructure.mapper.product.purchase.PurchaseStockMapper; import com.gogirl.infrastructure.mapper.product.purchase.PurchaseStockMapper;
import com.gogirl.infrastructure.mapper.product.purchase.PurchaseStockRecordMapper; import com.gogirl.infrastructure.mapper.product.purchase.PurchaseStockRecordMapper;
import com.gogirl.infrastructure.mapper.product.serve.BaseProduceMapper;
import com.gogirl.infrastructure.mapper.store.complaint.ComplaintDetailedMapper; import com.gogirl.infrastructure.mapper.store.complaint.ComplaintDetailedMapper;
import com.gogirl.infrastructure.mapper.store.complaint.ComplaintDetailedTechnicianMapper; import com.gogirl.infrastructure.mapper.store.complaint.ComplaintDetailedTechnicianMapper;
import com.gogirl.infrastructure.mapper.store.complaint.ComplaintMainMapper; import com.gogirl.infrastructure.mapper.store.complaint.ComplaintMainMapper;
...@@ -62,6 +64,7 @@ import com.gogirl.infrastructure.schedule.Schedule; ...@@ -62,6 +64,7 @@ import com.gogirl.infrastructure.schedule.Schedule;
import com.gogirl.infrastructure.service.excel.ExcelListener; import com.gogirl.infrastructure.service.excel.ExcelListener;
import com.gogirl.infrastructure.service.excel.MallProductExcelListener; import com.gogirl.infrastructure.service.excel.MallProductExcelListener;
import com.gogirl.infrastructure.service.mail.MailService; import com.gogirl.infrastructure.service.mail.MailService;
import com.gogirl.shared.product.BaseProduceDto;
import com.gogirl.shared.product.PurchaseSkuPOI; import com.gogirl.shared.product.PurchaseSkuPOI;
import com.gogirl.shared.product.excel.ImportMallProductExcel; import com.gogirl.shared.product.excel.ImportMallProductExcel;
import com.gogirl.shared.product.excel.ImportPurchaseSkuExcel; import com.gogirl.shared.product.excel.ImportPurchaseSkuExcel;
...@@ -711,6 +714,16 @@ public class Test { ...@@ -711,6 +714,16 @@ public class Test {
EasyExcel.write("/Users/huluobin/exportSku.xlsx", PurchaseSkuPOI.class).sheet().doWrite(purchaseSkuPOIS); EasyExcel.write("/Users/huluobin/exportSku.xlsx", PurchaseSkuPOI.class).sheet().doWrite(purchaseSkuPOIS);
} }
@Resource
BaseProduceMapper baseProduceMapper;
@org.junit.Test
public void exportBaseProduce() {
List<BaseProduceDto> baseServeList = baseProduceMapper.exportBaseProduce();
EasyExcel.write("/Users/huluobin/exportBaseProduce.xlsx", BaseProduceDto.class).sheet().doWrite(baseServeList);
}
@Resource @Resource
MallProductMapper mallProductMapper; MallProductMapper mallProductMapper;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment