From 7f9507a0ffee972555b2fd4d828676398be3def4 Mon Sep 17 00:00:00 2001 From: luozukai Date: Wed, 15 May 2019 14:42:31 +0800 Subject: [PATCH] =?UTF-8?q?[=E8=A7=A3=E5=8D=95][=E6=B7=BB=E5=8A=A0][?= =?UTF-8?q?=E5=BC=80=E5=8F=91=E8=A7=A3=E5=8D=95api]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../V201905151408__L_ALTER_MERCHANT.sql | 2 ++ .../WxMerchantTradeDailyController.java | 7 ++++--- .../com/iformall/domain/po/WxMerchant.java | 17 ++++++++++++++--- .../service/WxMerchantTradeDailyService.java | 2 +- .../impl/WxMerchantTradeDailyServiceImpl.java | 18 +++++++----------- .../main/resources/mapper/WxMerchantMapper.xml | 3 ++- 6 files changed, 30 insertions(+), 19 deletions(-) create mode 100644 mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql diff --git a/mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql b/mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql new file mode 100644 index 000000000..5a0a1bbad --- /dev/null +++ b/mallinkAdmin/src/main/resources/db/migration/V201905151408__L_ALTER_MERCHANT.sql @@ -0,0 +1,2 @@ +ALTER TABLE wx_merchant + ADD COLUMN qr_code varchar(500) DEFAULT NULL COMMENT '二维码地址'; \ No newline at end of file diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java index 7dcd7f0df..2240a4a22 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java @@ -40,10 +40,11 @@ public class WxMerchantTradeDailyController extends BaseController { @Autowired private WxMerchantService wxMerchantService; - @ApiOperation("获得当日解单") + @ApiOperation("获得指定日期的解单,默认不传reportDate为当天") @GetMapping("/getVolume") - public ResultData getVolume() { - return wxMerchantTradeDailyService.getVolume(getUser().getId()); + public ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily) { + wxMerchantTradeDaily.setTenantId(getTenantId()); + return wxMerchantTradeDailyService.getVolume(wxMerchantTradeDaily,getUser().getId()); } @ApiOperation("获得近7日解单") diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java index 61689d1b9..164b403ac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java @@ -143,7 +143,6 @@ public class WxMerchant extends BaseEntity { @Excel(name="商户状态",width = 20,orderNum = "6",replace = {"停用_0","正常_1"}) private Integer status; - @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") private Integer businessId; @@ -183,7 +182,11 @@ public class WxMerchant extends BaseEntity { @io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime") private Date topTime; - @Transient + @io.swagger.annotations.ApiModelProperty(value="二维码地址",name="qrCode") + private String qrCode; + + + @Transient private WxProfitSharingReceiver wxProfitSharingReceiver; public WxProfitSharingReceiver getWxProfitSharingReceiver() { @@ -194,7 +197,15 @@ public class WxMerchant extends BaseEntity { this.wxProfitSharingReceiver = wxProfitSharingReceiver; } - public Date getTopTime() { + public String getQrCode() { + return qrCode; + } + + public void setQrCode(String qrCode) { + this.qrCode = qrCode; + } + + public Date getTopTime() { return topTime; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java index 0008199ae..fef3f9ef4 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java @@ -51,7 +51,7 @@ public interface WxMerchantTradeDailyService { * 获取当日解单数据 */ - ResultData getVolume(Long userId); + ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily,Long userId); /** diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java index e5c1d2e73..cc9fd1d55 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java @@ -247,30 +247,26 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ } @Override - public ResultData getVolume(Long userId) { - + public ResultData getVolume(WxMerchantTradeDaily merchantTradeDaily,Long userId) { WxMerchantBUser user = wxMerchantBUserService.getById(userId); - if (user==null) return new ResultData(ErrorCode.USER_IS_EMPTY); - WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); - if (merchant==null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); - WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); if (mall==null) return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); - WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); - wxMerchantTradeDaily.setMerchantId(merchant.getId()); - SimpleDateFormat fmt=new SimpleDateFormat("yyyy-MM-dd"); - wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); - + if(merchantTradeDaily.getReportDate() != null){ + wxMerchantTradeDaily.setReportDate(merchantTradeDaily.getReportDate()); + }else { + SimpleDateFormat fmt=new SimpleDateFormat("yyyy-MM-dd"); + wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); + } List tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); diff --git a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml index 83172ea76..aed4c75c2 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantMapper.xml @@ -24,12 +24,13 @@ + `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, - `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting` + `business_id`,`sub_business_id`,`shop_type`,`brand`,`type`,`is_public`,email,`title`,`cover_picture`,`is_admin`,`bill_setting`,qr_code