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

Merge commit 'refs/tags/jenkins-back-end-747^{}' into release

release_toaliyun_real
hupeng 7 лет назад
Родитель
Сommit
66f9c5a234
2 измененных файлов: 12 добавлений и 11 удалений
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java
  2. +11
    -10
      mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/WxUserStructureController.java Просмотреть файл

@@ -133,7 +133,7 @@ public class WxUserStructureController extends BaseController {
other.setLevel("无");
WxCUserBasicInfoDto dto = new WxCUserBasicInfoDto();
other.setCount(wxCUserBasicInfoService.findCount(dto)
-levelList.stream().map(WxLevelConfig::getCount).reduce(Long::sum).get());
- levelList.stream().map(WxLevelConfig::getCount).reduce(Long::sum).orElse(0L));

levelList.add(other);
return new ResultData(levelList);


+ 11
- 10
mallinkCApi/src/main/java/com/iformall/controller/WxPressOrderController.java Просмотреть файл

@@ -12,6 +12,7 @@ import com.iformall.service.WxCouponService;
import com.iformall.service.WxOrderPressService;
import com.iformall.service.WxOrderService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
@@ -108,23 +109,23 @@ public class WxPressOrderController extends BaseController {
return new ResultData();
}

@ApiOperation(value = "砍价状态(1:我发起的砍价,2:未参与的砍价, 3:已参与的砍价)", notes = "{\"orderId\":\"String\"}")
@PostMapping("getPressOrderStatus")
public ResultData getPressOrderStatus(@RequestBody Map<String, String> paramMap) {
@ApiOperation(value = "砍价状态(1:我发起的砍价,2:未参与的砍价, 3:已参与的砍价)", notes = "")
@GetMapping("getPressOrderStatus")
@ApiImplicitParam(name = "orderId", value = "orderId", dataType = "String", paramType = "query", required = true)
public ResultData getPressOrderStatus(String orderId) {
Map ret = new HashMap();
String orderIdStr = paramMap.get("orderId");
if (StringUtils.isBlank(orderIdStr)) {
if (StringUtils.isBlank(orderId)) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空");
}
Long orderId = 0L;
Long orderIdL = 0L;
try {
orderId = Long.valueOf(orderIdStr);
orderIdL = Long.valueOf(orderId);
} catch (NumberFormatException e) {
logger.error("orderId convert error, " + orderIdStr + ", e:" + e.getMessage());
return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "orderId: " + orderIdStr + ", e:" + e.getMessage());
logger.error("orderId convert error, " + orderId + ", e:" + e.getMessage());
return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "orderId: " + orderId + ", e:" + e.getMessage());
}
WxCUser user = getUser();
WxOrder order = wxOrderService.getById(orderId);
WxOrder order = wxOrderService.getById(orderIdL);
if(order == null) {
logger.error("订单不存在:" + orderId);
return new ResultData(ErrorCode.ORDER_IS_NOT_FIND);


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