diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java index b726bc429..fcf1396ee 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/AliBusinessCircleOrderController.java @@ -6,6 +6,7 @@ import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.AliBusinessCircleOrder; +import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.AliBusinessCircleOrderService; import com.iformall.utils.Constant; @@ -22,6 +23,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + @RestController @RequestMapping("aliCircle") @Api(description = "订单相关接口") @@ -39,7 +43,7 @@ public class AliBusinessCircleOrderController extends BaseController { }) @SystemControllerLog(description = "-列表") public ResultData list(@ModelAttribute AliBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxOrderController::list"); + logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::list"); if (null == circleOrder) { circleOrder = new AliBusinessCircleOrder(); } @@ -70,5 +74,17 @@ public class AliBusinessCircleOrderController extends BaseController { return new ResultData(order); } + @GetMapping("exportData") + @SystemControllerLog(description = "券订单数据-导出数据") + public void exportData(@ModelAttribute AliBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] AliBusinessCircleOrderController::exportData"); + if (null == circleOrder) { + circleOrder = new AliBusinessCircleOrder(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); + aliBusinessCircleOrderService.exportData(circleOrder, request, response); + } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java index 736a04023..f422276ed 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxBusinessCircleOrderController.java @@ -7,7 +7,6 @@ import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; import com.iformall.domain.po.*; import com.iformall.domain.po.base.BaseEntity; -import com.iformall.domain.po.tt.TtOrder; import com.iformall.service.*; import com.iformall.utils.Constant; import io.swagger.annotations.Api; @@ -20,6 +19,9 @@ import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + @RestController @RequestMapping("wxCircle") @Api(description = "订单相关接口") @@ -37,7 +39,7 @@ public class WxBusinessCircleOrderController extends BaseController { }) @SystemControllerLog(description = "-列表") public ResultData list(@ModelAttribute WxBusinessCircleOrder circleOrder, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxOrderController::list"); + logger.debug("[" + getIpAddr() + "] WxBusinessCircleOrderController::list"); if (null == circleOrder) { circleOrder = new WxBusinessCircleOrder(); } @@ -68,5 +70,17 @@ public class WxBusinessCircleOrderController extends BaseController { return new ResultData(order); } + @GetMapping("exportData") + @SystemControllerLog(description = "券订单数据-导出数据") + public void exportData(@ModelAttribute WxBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] WxBusinessCircleOrderController::exportData"); + if (null == circleOrder) { + circleOrder = new WxBusinessCircleOrder(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); + wxBusinessCircleOrderService.exportData(circleOrder, request, response); + } + } diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java index 942355b80..6dba30a2a 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxThirdPartyOrdersController.java @@ -5,6 +5,7 @@ import com.iformall.annotation.SystemControllerLog; import com.iformall.common.ErrorCode; import com.iformall.common.ResultData; import com.iformall.controller.base.BaseController; +import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.WxThirdPartyOrders; import com.iformall.domain.po.base.BaseEntity; import com.iformall.service.WxThirdPartyOrdersService; @@ -22,6 +23,9 @@ import org.springframework.web.bind.annotation.ModelAttribute; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; + @RestController @RequestMapping("thirdCircle") @Api(description = "订单相关接口") @@ -39,7 +43,7 @@ public class WxThirdPartyOrdersController extends BaseController { }) @SystemControllerLog(description = "-列表") public ResultData list(@ModelAttribute WxThirdPartyOrders circleOrder, Integer pageNum, Integer pageSize) { - logger.debug("[" + getIpAddr() + "] WxOrderController::list"); + logger.debug("[" + getIpAddr() + "] WxThirdPartyOrdersController::list"); if (null == circleOrder) { circleOrder = new WxThirdPartyOrders(); } @@ -70,5 +74,16 @@ public class WxThirdPartyOrdersController extends BaseController { return new ResultData(order); } + @GetMapping("exportData") + @SystemControllerLog(description = "券订单数据-导出数据") + public void exportData(@ModelAttribute WxThirdPartyOrders circleOrder, HttpServletRequest request, HttpServletResponse response) { + logger.debug("[" + getIpAddr() + "] WxThirdPartyOrdersController::exportData"); + if (null == circleOrder) { + circleOrder = new WxThirdPartyOrders(); + } + circleOrder.updateTenantInfo(getTenantInfo()); + circleOrder.setSortColumns(BaseEntity.SortField.CreateTime_DESC,BaseEntity.SortField.Id_DESC); + wxThirdPartyOrdersOrderService.exportData(circleOrder, request, response); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java index ea30a7d11..d67086f85 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/AliBusinessCircleOrder.java @@ -1,6 +1,6 @@ package com.iformall.domain.po; -import com.baomidou.mybatisplus.annotation.TableField; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -18,6 +18,7 @@ public class AliBusinessCircleOrder extends BusinessCircleBase { @io.swagger.annotations.ApiModelProperty(value="发生交易的商圈(非商圈组)的名称",name="mallName") private String mallName; + @Excel(name = "门店编码", width = 20, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="门店编号,商户侧系统内编号",name="mallStoreId") private String mallStoreId; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java b/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java index 4471abafc..636ea6d67 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/BusinessCircleBase.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.iformall.domain.po.base.TenantEntity; @@ -29,6 +30,7 @@ public class BusinessCircleBase extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="商圈支付结果通知回调摘要",name="summary") private String summary; + @Excel(name = "交易时间", width = 20, orderNum = "4", format = "yyyy-MM-dd HH:mm:ss") @io.swagger.annotations.ApiModelProperty(value="交易完成时间",name="timeEnd") private Date timeEnd; @@ -46,6 +48,7 @@ public class BusinessCircleBase extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="用户实际付款金额,单位(分)",name="payAmount") private Integer payAmount; + @Excel(name = "付款金额(元)", width = 20, orderNum = "5") @TableField(exist = false) @io.swagger.annotations.ApiModelProperty(value="用户实际付款金额,单位(元)",name="payAmountStr") private String payAmountStr; @@ -54,9 +57,11 @@ public class BusinessCircleBase extends TenantEntity { return payAmount != null ? new BigDecimal(payAmount).divide(new BigDecimal(100)).toPlainString(): payAmountStr; } + @Excel(name = "支付订单号", width = 20, orderNum = "3") @io.swagger.annotations.ApiModelProperty(value="支付订单号",name="transactionId") private String transactionId; + @Excel(name = "通知时间", width = 20, orderNum = "8", format = "yyyy-MM-dd HH:mm:ss") @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createTime") private Date createTime; @@ -65,26 +70,33 @@ public class BusinessCircleBase extends TenantEntity { @io.swagger.annotations.ApiModelProperty(value="门店Id,与第三方对齐",name="merchantId") private Long merchantId; + @Excel(name = "门店名称", width = 20, orderNum = "2") private String merchantName; @TableField(exist = false) private WxMerchant merchant; + @Excel(name = "会员ID", width = 20, orderNum = "6") @io.swagger.annotations.ApiModelProperty(value="c端会员id,与第三方对齐",name="cUserId") private Long cUserId; private String cUserNickName; + @Excel(name = "会员手机号", width = 20, orderNum = "7") private String cUserPhone; @TableField(exist = false) private WxCUserBasicInfo basicInfo; + @Excel(name = "是否获得积分", width = 20, orderNum = "9", replace = {"是_1", "否_0"}) @io.swagger.annotations.ApiModelProperty(value="是否获得积分(1:是,0:否)",name="earnPoints") private Integer earnPoints; + @Excel(name = "更新积分值", width = 20, orderNum = "10") @io.swagger.annotations.ApiModelProperty(value="订单更新积分值",name="increasedPoints") private Integer increasedPoints; + @Excel(name = "积分更新时间", width = 20, orderNum = "11", format = "yyyy-MM-dd HH:mm:ss") @io.swagger.annotations.ApiModelProperty(value="积分更新时间(新增)",name="increasedPoints") private Date pointsUpdateTime; + @Excel(name = "是否退款", width = 20, orderNum = "12", replace = {"是_1", "_0"}) @io.swagger.annotations.ApiModelProperty(value="是否退款(1:是,0:否)",name="isRefund") private Integer isRefund; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxBusinessCircleOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxBusinessCircleOrder.java index 676eaff55..7139a91b6 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxBusinessCircleOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxBusinessCircleOrder.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; @@ -20,6 +21,7 @@ public class WxBusinessCircleOrder extends BusinessCircleBase { @io.swagger.annotations.ApiModelProperty(value="门店名称,商圈在商圈小程序上圈店时填写的门店名称",name="wxShopName") private String wxShopName; + @Excel(name = "门店编码", width = 20, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="门店编号,商圈在商圈小程序上圈店时填写的门店编号,用于跟商圈自身已有的商户识别码对齐",name="wxShopNumber") private String wxShopNumber; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyOrders.java b/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyOrders.java index abc94c7f3..500da03df 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyOrders.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxThirdPartyOrders.java @@ -1,5 +1,6 @@ package com.iformall.domain.po; +import cn.afterturn.easypoi.excel.annotation.Excel; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; @@ -25,6 +26,7 @@ public class WxThirdPartyOrders extends BusinessCircleBase { @io.swagger.annotations.ApiModelProperty(value="门店名称",name="shopName") private String shopName; + @Excel(name = "门店编码", width = 20, orderNum = "1") @io.swagger.annotations.ApiModelProperty(value="门店编号",name="shopNumber") private String shopNumber; diff --git a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java index b830444fc..67e04a387 100644 --- a/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/AliBusinessCircleOrderService.java @@ -6,6 +6,8 @@ import com.iformall.domain.po.AliBusinessCircleOrder; import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.base.TenantEntity; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; public interface AliBusinessCircleOrderService { @@ -49,4 +51,5 @@ public interface AliBusinessCircleOrderService { */ void updatePoints(AliBusinessCircleOrder record); + void exportData(AliBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java index 2cdc08e64..3136666c0 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxBusinessCircleOrderService.java @@ -5,6 +5,8 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxBusinessCircleOrder; import com.iformall.domain.po.base.TenantEntity; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; public interface WxBusinessCircleOrderService { @@ -52,4 +54,5 @@ public interface WxBusinessCircleOrderService { */ void updateIsPointsNotify(WxBusinessCircleOrder record); + void exportData(WxBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java b/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java index deae7a389..62c1d3b77 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxThirdPartyOrdersService.java @@ -6,6 +6,8 @@ import com.iformall.domain.po.WxThirdPartyOrders; import com.iformall.domain.po.base.TenantEntity; import com.iformall.enums.EnumThirdOrderType; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.List; public interface WxThirdPartyOrdersService { @@ -55,4 +57,5 @@ public interface WxThirdPartyOrdersService { */ void pointDeduction(WxThirdPartyOrders record); + void exportData(WxThirdPartyOrders circleOrder, HttpServletRequest request, HttpServletResponse response); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java index 7d97ae68b..4e138fee0 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/AliBusinessCircleOrderServiceImpl.java @@ -20,6 +20,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.util.Date; import java.util.List; @@ -30,6 +32,9 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder private static final String ALI_CIRCLE_KEY = "CIRCLE:ALI:"; + @Autowired + ExcelService excelService; + @Autowired RedisLock redisLock; @@ -346,4 +351,11 @@ public class AliBusinessCircleOrderServiceImpl implements AliBusinessCircleOrder aliBusinessCircleOrderMapper.updatePoints(record); } + @Override + public void exportData(AliBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response) { + List list = aliBusinessCircleOrderMapper.findList(circleOrder); + excelService.exportExcel(list, null, "支付宝商圈交易", AliBusinessCircleOrder.class, "支付宝商圈交易.xlsx", response, false); + + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java index 12b940d00..75586aeee 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxBusinessCircleOrderServiceImpl.java @@ -20,6 +20,8 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.Date; import java.util.List; @@ -31,6 +33,9 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe private final String WX_CIRCLE_KEY = "CIRCLE:WX:"; + @Autowired + ExcelService excelService; + @Autowired RedisLock redisLock; @@ -359,5 +364,11 @@ public class WxBusinessCircleOrderServiceImpl implements WxBusinessCircleOrderSe wxBusinessCircleOrderMapper.updateIsPointsNotify(record); } + @Override + public void exportData(WxBusinessCircleOrder circleOrder, HttpServletRequest request, HttpServletResponse response) { + List list = wxBusinessCircleOrderMapper.findList(circleOrder); + excelService.exportExcel(list, null, "微信商圈交易", WxBusinessCircleOrder.class, "微信商圈交易.xlsx", response, false); + } + } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index dff8938df..16e025847 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -20,9 +20,12 @@ import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Propagation; import org.springframework.transaction.annotation.Transactional; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; import java.math.BigDecimal; import java.util.Date; import java.util.List; +import java.util.Map; @Service public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService { @@ -31,6 +34,9 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService private static final String THIRD_CIRCLE_KEY = "CIRCLE:TH:"; + @Autowired + ExcelService excelService; + @Autowired RedisLock redisLock; @@ -441,8 +447,12 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService redisLock.unlock(lockKey, timeStr); } } + } - + @Override + public void exportData(WxThirdPartyOrders circleOrder, HttpServletRequest request, HttpServletResponse response) { + List list = wxThirdPartyOrdersMapper.findList(circleOrder); + excelService.exportExcel(list, null, "三方交易", WxThirdPartyOrders.class, "三方交易.xlsx", response, false); }