| @@ -0,0 +1,2 @@ | |||||
| ALTER TABLE wx_merchant | |||||
| ADD COLUMN qr_code varchar(500) DEFAULT NULL COMMENT '二维码地址'; | |||||
| @@ -40,10 +40,11 @@ public class WxMerchantTradeDailyController extends BaseController { | |||||
| @Autowired | @Autowired | ||||
| private WxMerchantService wxMerchantService; | private WxMerchantService wxMerchantService; | ||||
| @ApiOperation("获得当日解单") | |||||
| @ApiOperation("获得指定日期的解单,默认不传reportDate为当天") | |||||
| @GetMapping("/getVolume") | @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日解单") | @ApiOperation("获得近7日解单") | ||||
| @@ -143,7 +143,6 @@ public class WxMerchant extends BaseEntity { | |||||
| @Excel(name="商户状态",width = 20,orderNum = "6",replace = {"停用_0","正常_1"}) | @Excel(name="商户状态",width = 20,orderNum = "6",replace = {"停用_0","正常_1"}) | ||||
| private Integer status; | private Integer status; | ||||
| @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") | @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") | ||||
| private Integer businessId; | private Integer businessId; | ||||
| @@ -183,7 +182,11 @@ public class WxMerchant extends BaseEntity { | |||||
| @io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime") | @io.swagger.annotations.ApiModelProperty(value = "置顶时间", name = "topTime") | ||||
| private Date topTime; | private Date topTime; | ||||
| @Transient | |||||
| @io.swagger.annotations.ApiModelProperty(value="二维码地址",name="qrCode") | |||||
| private String qrCode; | |||||
| @Transient | |||||
| private WxProfitSharingReceiver wxProfitSharingReceiver; | private WxProfitSharingReceiver wxProfitSharingReceiver; | ||||
| public WxProfitSharingReceiver getWxProfitSharingReceiver() { | public WxProfitSharingReceiver getWxProfitSharingReceiver() { | ||||
| @@ -194,7 +197,15 @@ public class WxMerchant extends BaseEntity { | |||||
| this.wxProfitSharingReceiver = wxProfitSharingReceiver; | this.wxProfitSharingReceiver = wxProfitSharingReceiver; | ||||
| } | } | ||||
| public Date getTopTime() { | |||||
| public String getQrCode() { | |||||
| return qrCode; | |||||
| } | |||||
| public void setQrCode(String qrCode) { | |||||
| this.qrCode = qrCode; | |||||
| } | |||||
| public Date getTopTime() { | |||||
| return topTime; | return topTime; | ||||
| } | } | ||||
| @@ -51,7 +51,7 @@ public interface WxMerchantTradeDailyService { | |||||
| * 获取当日解单数据 | * 获取当日解单数据 | ||||
| */ | */ | ||||
| ResultData getVolume(Long userId); | |||||
| ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily,Long userId); | |||||
| /** | /** | ||||
| @@ -247,30 +247,26 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ | |||||
| } | } | ||||
| @Override | @Override | ||||
| public ResultData getVolume(Long userId) { | |||||
| public ResultData getVolume(WxMerchantTradeDaily merchantTradeDaily,Long userId) { | |||||
| WxMerchantBUser user = wxMerchantBUserService.getById(userId); | WxMerchantBUser user = wxMerchantBUserService.getById(userId); | ||||
| if (user==null) | if (user==null) | ||||
| return new ResultData(ErrorCode.USER_IS_EMPTY); | return new ResultData(ErrorCode.USER_IS_EMPTY); | ||||
| WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); | WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); | ||||
| if (merchant==null) | if (merchant==null) | ||||
| return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); | return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); | ||||
| WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); | WxMall mall = wxMallService.getByTenantId(merchant.getTenantId()); | ||||
| if (mall==null) | if (mall==null) | ||||
| return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); | return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); | ||||
| WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); | WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); | ||||
| wxMerchantTradeDaily.setMerchantId(merchant.getId()); | 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<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); | List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); | ||||
| @@ -24,12 +24,13 @@ | |||||
| <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> | <result column="cover_picture" jdbcType="VARCHAR" property="coverPicture"/> | ||||
| <result column="is_admin" jdbcType="INTEGER" property="isAdmin"/> | <result column="is_admin" jdbcType="INTEGER" property="isAdmin"/> | ||||
| <result column="bill_setting" jdbcType="INTEGER" property="billSetting"/> | <result column="bill_setting" jdbcType="INTEGER" property="billSetting"/> | ||||
| <result column="qr_code" property="qrCode"/> | |||||
| </resultMap> | </resultMap> | ||||
| <sql id="allColumns"> | <sql id="allColumns"> | ||||
| `id`,`tenant_id`,`img_url`,`name`,`link_phone`,`create_date`,`update_date`,`car_vendor_type`,`car_params`,`status`,`link_person`, | `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 | |||||
| </sql> | </sql> | ||||
| <sql id="dynamicWhereConditions"> | <sql id="dynamicWhereConditions"> | ||||