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

[解单][添加]:增加获取当日解单接口

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

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

@@ -25,7 +25,13 @@ public class WxMerchantTradeDailyController extends BaseController
private WxMerchantTradeDailyService wxMerchantTradeDailyService; private WxMerchantTradeDailyService wxMerchantTradeDailyService;


private Logger logger = Logger.getLogger(WxMerchantTradeDailyController.class); private Logger logger = Logger.getLogger(WxMerchantTradeDailyController.class);


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


@ApiOperation("上报每日解单") @ApiOperation("上报每日解单")
@GetMapping("/reportDailyVolume") @GetMapping("/reportDailyVolume")


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

@@ -127,14 +127,19 @@ public enum ErrorCode{
PROFIT_SHARING_APPLY_FAILED(12031, "分账业务失败"), PROFIT_SHARING_APPLY_FAILED(12031, "分账业务失败"),
PROFIT_SHARING_RETURN_INVALID(12032, "分账请求返回校验失败"), PROFIT_SHARING_RETURN_INVALID(12032, "分账请求返回校验失败"),
PROFIT_SHARING_RECEIVER_INVALID(12033, "分账接受方查寻无效"), PROFIT_SHARING_RECEIVER_INVALID(12033, "分账接受方查寻无效"),
PROFIT_SHARING_QUERY_REQUEST_FAILED(12030, "分账查询请求失败"),
PROFIT_SHARING_QUERY_APPLY_FAILED(12031, "分账查询业务失败"),
PROFIT_SHARING_QUERY_RETURN_INVALID(12032, "分账查询返回校验失败"),
PROFIT_SHARING_QUERY_REQUEST_FAILED(12034, "分账查询请求失败"),
PROFIT_SHARING_QUERY_APPLY_FAILED(12035, "分账查询业务失败"),
PROFIT_SHARING_QUERY_RETURN_INVALID(12036, "分账查询返回校验失败"),
/** /**
* 核销 * 核销
*/ */
VERIFY_ERROR(12050, "核销异常"), VERIFY_ERROR(12050, "核销异常"),
MSG_REPEAT_SEND(12061, "短信重新发送")
MSG_REPEAT_SEND(12061, "短信重新发送"),

/**
* 解单
*/
DALIY_REPORT_VOLUME_TODAY_NULL(12070, "今日解单不存在")


; ;




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

@@ -82,6 +82,11 @@ public class ResultData extends Result {
this.data = data; this.data = data;
} }


public ResultData(ErrorCode errorCode) {
this.code = errorCode.getCode();
this.message = errorCode.getMessage();
}

public HashMap<String, Object> toHashMap() { public HashMap<String, Object> toHashMap() {
HashMap<String, Object> map = new HashMap<>(3); HashMap<String, Object> map = new HashMap<>(3);
map.put("code", this.code); map.put("code", this.code);


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

@@ -41,7 +41,7 @@ public interface WxMerchantTradeDailyService {




/** /**
* 根据Id删除实体
* 上传当日解单数据
* *
* @param id * @param id
* @param volume * @param volume
@@ -49,6 +49,11 @@ public interface WxMerchantTradeDailyService {


public ResultData saveDailyTradingVolume(Long userId, Integer volume); public ResultData saveDailyTradingVolume(Long userId, Integer volume);


/**
* 获取当日解单数据
*/

public ResultData getVolume(Long userId);


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

@@ -67,20 +67,19 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
@Override @Override
public ResultData saveDailyTradingVolume(Long userId, Integer volume) { public ResultData saveDailyTradingVolume(Long userId, Integer volume) {


Map resultMap = new HashMap();
WxMerchantBUser user = wxMerchantBUserService.getById(userId); WxMerchantBUser user = wxMerchantBUserService.getById(userId);


if (user==null) if (user==null)
return new ResultData(ErrorCode.USER_IS_EMPTY, ErrorCode.USER_IS_EMPTY.getMessage());
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.MCH_INFO_NOT_FOUND, ErrorCode.MCH_INFO_NOT_FOUND.getMessage());
return new ResultData(ErrorCode.MCH_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.MCH_INFO_NOT_FOUND, ErrorCode.MCH_INFO_NOT_FOUND.getMessage());
return new ResultData(ErrorCode.MCH_INFO_NOT_FOUND);




WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily();
@@ -114,7 +113,42 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ


} }


@Override
public ResultData getVolume(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.MCH_INFO_NOT_FOUND);

WxMall mall = wxMallService.getByTenantId(merchant.getTenantId());
if (mall==null)
return new ResultData(ErrorCode.MCH_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.findList(wxMerchantTradeDaily);

if (tradeList.size() > 0 ) {
wxMerchantTradeDaily = tradeList.get(0);
return new ResultData(wxMerchantTradeDaily);
}

return new ResultData(ErrorCode.DALIY_REPORT_VOLUME_TODAY_NULL);

}


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