Skip to content

GitLab

Q
qk_backend
Commit a888a806 authored by shiyu's avatar shiyu
Browse files
Options

小程序寄售单商品寄出

parent 4a039366
Show whitespace changes
Inline Side-by-side
Showing with 24 additions and 34 deletions
ch-admin-api/src/main/java/com/wwdz/ch/admin/controller/ConsignSaleController.java
View file @ a888a806
......@@ -107,10 +107,10 @@ public class ConsignSaleController {
@ApiOperation(value = "用户商品确认售出")
@ApiOperation(value = "平台确认售出")
@PostMapping("/finishSale")
public Result finishSale(@RequestBody ConsignSaleRequestDto dto) {
logger.info("【请求开始】用户商品确认售出,请求参数:{}", JSON.toJSONString(dto));
logger.info("【请求开始】平台确认售出,请求参数:{}", JSON.toJSONString(dto));
Validator validator = new Validator(FormHandler.ofEntity(dto));
validator.set("saleId", "寄售单号").must().string()
.set("dealPrice", "成交价格").must().number()
......@@ -130,14 +130,11 @@ public class ConsignSaleController {
logger.info("【请求开始】完成用户结款,请求参数:{}", JSON.toJSONString(dto));
Validator validator = new Validator(FormHandler.ofEntity(dto));
validator.set("saleId", "寄售单号").must().string()
.set("credential", "结款凭证").must().number()
.set("credential", "结款凭证").must().string()
.end();
if (!validator.isValid()) {
return Result.failed(ResultCode.PARAM_ERROR.getCode(), validator.getErrorInfo());
}
if (StringUtils.isEmpty(dto.getRemark())) {
return Result.failed("成交平台必填");
}
return consignSaleService.finishSettlement(dto);
}
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/ConsignSaleServiceImpl.java
View file @ a888a806
......@@ -249,55 +249,55 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
}
for (ConsignSaleRecord consignSaleRecord : consignSaleRecordList) {
if (consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.CREATE_ORDER.getCode()) {
if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.CREATE_ORDER.getCode()) {
appletStateNodeVoList.get(0).setPassed(true);
appletStateNodeVoList.get(0).setTime(consignSaleRecord.getCreateTime());
appletStateNodeVoList.get(1).setPassed(true);
appletStateNodeVoList.get(1).setDesc(ConsignSaleEnum.AppletNodeDescEnum.VALUATE.getDes());
} else if (consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode()) {
} else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.SYS_CANCEL.getCode()) {
appletStateNodeVoList.get(7).setPassed(true);
appletStateNodeVoList.get(7).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark());
break;
} else if (consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode()) {
} else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode()) {
appletStateNodeVoList.get(7).setPassed(true);
appletStateNodeVoList.get(7).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark());
break;
} else if (consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.TIME_OUT_CANCEL.getCode()) {
} else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.TIME_OUT_CANCEL.getCode()) {
appletStateNodeVoList.get(7).setPassed(true);
appletStateNodeVoList.get(7).setDesc(consignSaleRecord.getContent());
break;
}
//图文估价
else if (consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.VALUATE.getCode()) {
else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.VALUATE.getCode()) {
appletStateNodeVoList.get(1).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark());
}
//送货至平台
else if (consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.USER_SEND.getCode()) {
else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.USER_SEND.getCode()) {
appletStateNodeVoList.get(2).setPassed(true);
appletStateNodeVoList.get(2).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark());
consignSaleAppletVo.setSendTime(consignSaleRecord.getCreateTime());
}
// 平台事务鉴定并定价，尚未鉴定
else if (consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.IDENTIFY.getCode()) {
else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.IDENTIFY.getCode()) {
appletStateNodeVoList.get(3).setPassed(true);
appletStateNodeVoList.get(3).setDesc(ConsignSaleEnum.AppletNodeDescEnum.IDENTIFY.getDes());
}
// 平台事务鉴定并定价,鉴定后
else if (consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.WAIT_USER_CONFIRM_IDENTIFY.getCode()) {
else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.WAIT_USER_CONFIRM_IDENTIFY.getCode()) {
appletStateNodeVoList.get(3).setPassed(true);
appletStateNodeVoList.get(3).setDesc(consignSaleRecord.getContent() + ";" + consignSaleRecord.getRemark());
}
// 寄售中
else if (consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.SALEING.getCode()) {
else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.SALEING.getCode()) {
appletStateNodeVoList.get(4).setPassed(true);
}
// 货品售出，待结款
else if (consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.SALED.getCode()) {
else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.SALED.getCode()) {
appletStateNodeVoList.get(5).setPassed(true);
appletStateNodeVoList.get(5).setDesc(ConsignSaleEnum.AppletNodeDescEnum.PRE_PAY.getDes());
}
// 平台完成结款
else if (consignSaleRecord.getType().intValue() == ConsignSaleEnum.OperateTypeEnum.FINISH.getCode()) {
else if (consignSaleRecord.getType() == ConsignSaleEnum.OperateTypeEnum.FINISH.getCode()) {
appletStateNodeVoList.get(6).setPassed(true);
consignSaleAppletVo.setFinishTime(consignSaleRecord.getCreateTime());
}
......@@ -463,12 +463,10 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
consignSale.setSystemState(ConsignSaleEnum.SaleForSysStateEnum.CANCEL.getCode());
consignSaleDao.update(consignSale);
//商品下架
itemDao.updateOnSale(dto.getItemId(), ItemStateEnum.SHELVE.getCode());
//插入操作记录,用户不满意初步估价
consignSaleRecordDao.insert(dto.getSaleId(), "不满意，取消寄售", ConsignSaleEnum.OperateTypeEnum.USER_CONFIRM_VALUATE.getCode(), null);
ConsignSale consignSaleInfo = consignSaleDao.findById(dto.getSaleId());
itemDao.updateOnSale(consignSaleInfo.getItemId(), ItemStateEnum.SHELVE.getCode());
//插入操作记录,用户主动取消
consignSaleRecordDao.insert(dto.getSaleId(), "用户主动取消", ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode(), null);
consignSaleRecordDao.insert(dto.getSaleId(), "不满意初步估价", ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode(), null);
}
return Result.success();
} catch (Exception e) {
......@@ -526,9 +524,7 @@ public class ConsignSaleServiceImpl implements ConsignSaleService {
itemDao.updateOnSale(dto.getItemId(), ItemStateEnum.SHELVE.getCode());
//插入操作记录,用户不满意建议零售价
consignSaleRecordDao.insert(dto.getSaleId(), "不满意，取消寄售", ConsignSaleEnum.OperateTypeEnum.USER_CONFIRM_IDENTIFY.getCode(), null);
//插入操作记录,用户主动取消
consignSaleRecordDao.insert(dto.getSaleId(), "用户主动取消", ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode(), null);
consignSaleRecordDao.insert(dto.getSaleId(), "不满意建议寄售价", ConsignSaleEnum.OperateTypeEnum.CUSTOM_CANCEL.getCode(), null);
}
return Result.success();
} catch (Exception e) {
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/web/ConsignSaleController.java
View file @ a888a806
......@@ -20,7 +20,6 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.*;
/**
......@@ -152,7 +151,7 @@ public class ConsignSaleController {
@PostMapping("/confirmForImgValuate")
public Result confirmForImgValuate(@RequestBody ConsignSaleRequestDto dto) {
logger.info("【请求开始】图文鉴定后用户确认,请求参数:{}", JSON.toJSONString(dto));
if (StringUtils.isEmpty(dto.getSaleId()) || StringUtils.isEmpty(dto.getItemId()) || ObjectUtils.isEmpty(dto.getAgree())) {
if (StringUtils.isEmpty(dto.getSaleId()) || ObjectUtils.isEmpty(dto.getAgree())) {
return Result.failed(ResultCode.PARAM_ERROR.getMessage());
}
return consignSaleService.confirmForImgValuate(dto);
......@@ -180,7 +179,7 @@ public class ConsignSaleController {
@PostMapping("/confirmForIdentify")
public Result confirmForIdentify(@RequestBody ConsignSaleRequestDto dto) {
logger.info("【请求开始】实物鉴定后用户确认,请求参数:{}", JSON.toJSONString(dto));
if (StringUtils.isEmpty(dto.getSaleId()) || StringUtils.isEmpty(dto.getItemId())|| ObjectUtils.isEmpty(dto.getAgree())) {
if (StringUtils.isEmpty(dto.getSaleId()) || ObjectUtils.isEmpty(dto.getAgree())) {
return Result.failed(ResultCode.PARAM_ERROR.getMessage());
}
return consignSaleService.confirmForIdentify(dto);
......@@ -223,12 +222,10 @@ public class ConsignSaleController {
LogisticsEnum[] logisticsEnums = LogisticsEnum.values();
List<Map<String, String>> mapList = new ArrayList<>();
Arrays.stream(logisticsEnums).forEach(logisticsEnum -> {
mapList.add(new HashMap() {{
put("code", logisticsEnum.getCode());
}});
mapList.add(new HashMap() {{
put("name", logisticsEnum.getName());
}});
HashMap map = new HashMap<>();
map.put("code", logisticsEnum.getCode());
map.put("name", logisticsEnum.getName());
mapList.add(map);
});
return Result.success(mapList);
} catch (Exception e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment