Просмотр исходного кода

[B端][新增]:新增获取近7日解单额度

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
0a6ee22608
6 измененных файлов: 71 добавлений и 9 удалений
  1. +6
    -0
      mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java
  2. +2
    -2
      mallinkService/src/main/java/com/simple/common/ErrorCode.java
  3. +2
    -2
      mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java
  4. +7
    -2
      mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java
  5. +36
    -1
      mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java
  6. +18
    -2
      mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml

+ 6
- 0
mallinkBApi/src/main/java/com/simple/controller/WxMerchantTradeDailyController.java Просмотреть файл

@@ -33,6 +33,12 @@ public class WxMerchantTradeDailyController extends BaseController
return wxMerchantTradeDailyService.getVolume(getUser().getId());
}

@ApiOperation("获得近7日解单")
@GetMapping("/getVolumeOfWeek")
public ResultData getVolumeOfWeek() {
return wxMerchantTradeDailyService.getVolumeOfWeek(getUser().getId());
}

@ApiOperation("上报每日解单")
@GetMapping("/reportDailyVolume")
@ApiImplicitParam(name="volume",value="总金额(分)",dataType="Integer", paramType = "query",required=true)


+ 2
- 2
mallinkService/src/main/java/com/simple/common/ErrorCode.java Просмотреть файл

@@ -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, "无解单数据")
;




+ 2
- 2
mallinkService/src/main/java/com/simple/mapper/WxMerchantTradeDailyMapper.java Просмотреть файл

@@ -8,9 +8,9 @@ import com.simple.domain.po.WxMerchantTradeDaily;
public interface WxMerchantTradeDailyMapper extends CommonMapper<WxMerchantTradeDaily, String> {

List<WxMerchantTradeDaily> findList(WxMerchantTradeDaily wxMerchantTradeDaily);


List<WxMerchantTradeDaily> findListOfWeek(WxMerchantTradeDaily wxMerchantTradeDaily);


+ 7
- 2
mallinkService/src/main/java/com/simple/service/WxMerchantTradeDailyService.java Просмотреть файл

@@ -54,8 +54,13 @@ public interface WxMerchantTradeDailyService {
*/

public ResultData getVolume(Long userId);


/**
* 获取近7日解单数据
*/

public ResultData getVolumeOfWeek(Long userId);
}

+ 36
- 1
mallinkService/src/main/java/com/simple/service/impl/WxMerchantTradeDailyServiceImpl.java Просмотреть файл

@@ -149,7 +149,42 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
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);

}


+ 18
- 2
mallinkService/src/main/resources/mapper/WxMerchantTradeDailyMapper.xml Просмотреть файл

@@ -63,8 +63,24 @@
select <include refid="allColumns" /> from wx_merchant_trade_daily
<include refid="dynamicWhereConditions" />
</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>


Загрузка…
Отмена
Сохранить