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

[解单][添加][开发解单api]

release_toaliyun_real
luozukai 7 лет назад
Родитель
Сommit
e057ba0433
5 измененных файлов: 38 добавлений и 42 удалений
  1. +7
    -37
      mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java
  2. +3
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java
  3. +23
    -0
      mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java
  4. +0
    -2
      mallinkService/src/main/java/com/iformall/service/WxMerchantTradeDailyService.java
  5. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxMerchantTradeDailyServiceImpl.java

+ 7
- 37
mallinkAdmin/src/main/java/com/iformall/controller/datatower/WxMerchantTradeDailyController.java Просмотреть файл

@@ -94,37 +94,6 @@ public class WxMerchantTradeDailyController extends BaseController {
return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily);
}




/**
* 详情
* @param wxMerchantTradeDaily
* @return
*/
@ApiOperation("详情")
@GetMapping("findById")
public ResultData findById(WxMerchantTradeDaily wxMerchantTradeDaily) {
logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::findById");
String tenantId = getTenantId();
wxMerchantTradeDaily.setTenantId(tenantId);
return new ResultData(wxMerchantTradeDailyService.getById(wxMerchantTradeDaily.getId()));
}

/**
* 保存或编辑
* @param wxMerchantTradeDaily
* @return
*/
@ApiOperation("保存或编辑")
@PostMapping("saveOrUpdate")
public ResultData saveOrUpdate(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) {
logger.debug("[" + getIpAddr() + "] wxMerchantTradeDaily::saveOrUpdate");
wxMerchantTradeDaily.setTenantId(super.getTenantId());
wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily);
return new ResultData();
}

/**
* 列表
*
@@ -153,9 +122,9 @@ public class WxMerchantTradeDailyController extends BaseController {

String startTime;
String endTime;
//month为空默认本月第一天到今天
//month为空取查询区间开始时间 结束时间
if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){
startTime = sd.format(DateUtils.getFirstDayForCurrMonth());
startTime = sd.format(pageInfo.getList().get(pageInfo.getList().size()-1).getCreateDate());
endTime = sd.format(new Date());
}else {
startTime = wxMerchantTradeDaily.getMonth()+"-01";
@@ -183,10 +152,11 @@ public class WxMerchantTradeDailyController extends BaseController {
}

pageInfo.setList(resultList);
for (WxMerchantTradeDaily w:resultList) {
System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt());
System.out.println("---------");
}

// for (WxMerchantTradeDaily w:resultList) {
// System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt());
// System.out.println("---------");
// }
return new ResultData(pageInfo);
}



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

@@ -118,9 +118,9 @@ public class WxMerchantTradeDailyController extends BaseController {

String startTime;
String endTime;
//month为空默认本月第一天到今天
//month为空取查询区间开始时间 结束时间
if(StringUtils.isBlank(wxMerchantTradeDaily.getMonth())){
startTime = sd.format(DateUtils.getFirstDayForCurrMonth());
startTime = sd.format(pageInfo.getList().get(pageInfo.getList().size()-1).getCreateDate());
endTime = sd.format(new Date());
}else {
startTime = wxMerchantTradeDaily.getMonth()+"-01";
@@ -146,8 +146,8 @@ public class WxMerchantTradeDailyController extends BaseController {
resultList.get(0).setIsToday(1);
}
}
pageInfo.setList(resultList);

// pageInfo.setList(resultList);
// for (WxMerchantTradeDaily w:resultList) {
// System.out.println(sd.format(w.getCreateDate())+" "+w.getTradeAmt());
// System.out.println("---------");


+ 23
- 0
mallinkService/src/main/java/com/iformall/domain/vo/WxMerchantTradeDailyVo.java Просмотреть файл

@@ -71,7 +71,30 @@ public class WxMerchantTradeDailyVo extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "B端用户手机号", name = "bUserPhone")
private String bUserPhone;

/*交易笔数**/
@io.swagger.annotations.ApiModelProperty(value = "交易笔数", name = "tradeCount")
@Transient
private String tradeCount;
/*凭证**/
@io.swagger.annotations.ApiModelProperty(value = "凭证", name = "proof")
@Transient
private String proof;

public String getTradeCount() {
return tradeCount;
}

public void setTradeCount(String tradeCount) {
this.tradeCount = tradeCount;
}

public String getProof() {
return proof;
}

public void setProof(String proof) {
this.proof = proof;
}

public String getMerchantName() {
return merchantName;


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

@@ -11,8 +11,6 @@ public interface WxMerchantTradeDailyService {
* 根据实体查询分页列表
*
* @param record
* @param offset
* @param limit
* @return
*/
PageInfo<WxMerchantTradeDaily> listAsPage(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize);


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

@@ -142,6 +142,9 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
wxMerchantTradeDaily = tradeList.get(0);
wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt());
wxMerchantTradeDaily.setUpdateDate(new Date());

wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount());
wxMerchantTradeDaily.setProof(tradeDailyVo.getProof());
wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily);
return new ResultData(wxMerchantTradeDaily);
}
@@ -153,6 +156,8 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ
wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt());
wxMerchantTradeDaily.setCreateDate(new Date());
wxMerchantTradeDaily.setUpdateDate(new Date());
wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount());
wxMerchantTradeDaily.setProof(tradeDailyVo.getProof());
wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily);

return new ResultData(Result.SUCCESS, "操作成功");


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