| @@ -33,6 +33,12 @@ public class WxMerchantTradeDailyController extends BaseController | |||||
| return wxMerchantTradeDailyService.getVolume(getUser().getId()); | return wxMerchantTradeDailyService.getVolume(getUser().getId()); | ||||
| } | } | ||||
| @ApiOperation("获得近7日解单") | |||||
| @GetMapping("/getVolumeOfWeek") | |||||
| public ResultData getVolumeOfWeek() { | |||||
| return wxMerchantTradeDailyService.getVolumeOfWeek(getUser().getId()); | |||||
| } | |||||
| @ApiOperation("上报每日解单") | @ApiOperation("上报每日解单") | ||||
| @GetMapping("/reportDailyVolume") | @GetMapping("/reportDailyVolume") | ||||
| @ApiImplicitParam(name="volume",value="总金额(分)",dataType="Integer", paramType = "query",required=true) | @ApiImplicitParam(name="volume",value="总金额(分)",dataType="Integer", paramType = "query",required=true) | ||||
| @@ -156,8 +156,8 @@ public enum ErrorCode{ | |||||
| /** | /** | ||||
| * 解单 | * 解单 | ||||
| */ | */ | ||||
| DALIY_REPORT_VOLUME_TODAY_NULL(12070, "今日解单不存在") | |||||
| DALIY_REPORT_VOLUME_TODAY_NULL(12070, "今日解单不存在"), | |||||
| DALIY_REPORT_VOLUME_WEEK_NULL(12070, "无解单数据") | |||||
| ; | ; | ||||
| @@ -8,9 +8,9 @@ import com.simple.domain.po.WxMerchantTradeDaily; | |||||
| public interface WxMerchantTradeDailyMapper extends CommonMapper<WxMerchantTradeDaily, String> { | public interface WxMerchantTradeDailyMapper extends CommonMapper<WxMerchantTradeDaily, String> { | ||||
| List<WxMerchantTradeDaily> findList(WxMerchantTradeDaily wxMerchantTradeDaily); | List<WxMerchantTradeDaily> findList(WxMerchantTradeDaily wxMerchantTradeDaily); | ||||
| List<WxMerchantTradeDaily> findListOfWeek(WxMerchantTradeDaily wxMerchantTradeDaily); | |||||
| @@ -54,8 +54,13 @@ public interface WxMerchantTradeDailyService { | |||||
| */ | */ | ||||
| public ResultData getVolume(Long userId); | public ResultData getVolume(Long userId); | ||||
| /** | |||||
| * 获取近7日解单数据 | |||||
| */ | |||||
| public ResultData getVolumeOfWeek(Long userId); | |||||
| } | } | ||||
| @@ -149,7 +149,42 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ | |||||
| return new ResultData(ErrorCode.DALIY_REPORT_VOLUME_TODAY_NULL); | return new ResultData(ErrorCode.DALIY_REPORT_VOLUME_TODAY_NULL); | ||||
| } | } | ||||
| @Override | |||||
| public ResultData getVolumeOfWeek(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())); | |||||
| List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findListOfWeek(wxMerchantTradeDaily); | |||||
| if (tradeList.size() > 0 ) { | |||||
| return new ResultData(tradeList); | |||||
| } | |||||
| return new ResultData(ErrorCode.DALIY_REPORT_VOLUME_WEEK_NULL); | |||||
| } | |||||
| @@ -63,8 +63,24 @@ | |||||
| select <include refid="allColumns" /> from wx_merchant_trade_daily | select <include refid="allColumns" /> from wx_merchant_trade_daily | ||||
| <include refid="dynamicWhereConditions" /> | <include refid="dynamicWhereConditions" /> | ||||
| </select> | </select> | ||||
| <select id="findListOfWeek" parameterType="com.simple.domain.po.WxMerchantTradeDaily" resultMap="BaseResultMap"> | |||||
| select <include refid="allColumns" /> from wx_merchant_trade_daily | |||||
| where 1=1 | |||||
| <if test="reportDate!=null"> | |||||
| and `report_date` != #{reportDate} | |||||
| </if> | |||||
| <if test=" null != tenantId "> | |||||
| and `tenant_id` = #{tenantId} | |||||
| </if> | |||||
| <if test=" null != merchantId "> | |||||
| and `merchant_id` = #{merchantId} | |||||
| </if> | |||||
| order by create_date desc LIMIT 7 | |||||
| </select> | |||||