From 3cdddd8bb0a0b2cef27d44629647666579655877 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 28 Jun 2021 22:22:30 +0800
Subject: [PATCH] add confirmOrder
---
gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java | 1
gc-order/src/main/resources/mapper/order/AccountMapper.xml | 3 +
gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java | 8 ++-
gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmDto.java | 3 +
gc-order/src/main/java/com/xzx/gc/order/mapper/AccountMapper.java | 2 +
gc-order/src/main/java/com/xzx/gc/order/mapper/ScoreDetailsMapper.java | 7 +++
gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java | 58 ++++++++++++++++++++++++++--
gc-order/src/main/resources/mapper/order/ScoreDetailsMapper.xml | 5 ++
8 files changed, 79 insertions(+), 8 deletions(-)
diff --git a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
index 63f0cfb..72d3d33 100644
--- a/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
+++ b/gc-core/src/main/java/com/xzx/gc/entity/JhyOrder.java
@@ -41,6 +41,7 @@
private Integer status;
public static final Integer ORDER_STATUS_WAITING = 1;
public static final Integer ORDER_STATUS_IMG = 2;
+ public static final Integer ORDER_STATUS_CONFIRM = 3;
public static final Integer ORDER_STATUS_CANCEL = 5;
/**
diff --git a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
index ac46420..91f6e7a 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/controller/ApiJhyOrderController.java
@@ -71,13 +71,15 @@
@PostMapping(value = "/jhy/order/cancel/{orderId}")
public Result<String> cancelOrder(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
jhyOrderService.cancelOrder(orderId, getUserId(request));
- return null;
+ return Result.success();
}
@ApiOperation("确认订单-支付")
@PostMapping(value = "/jhy/order/confirm")
- public Result<String> confirmOrder(@RequestBody JhyOrderConfirmDto confirmDto) {
- return null;
+ public Result<String> confirmOrder(@RequestBody JhyOrderConfirmDto confirmDto, HttpServletRequest request) {
+ confirmDto.setUserId(getUserId(request));
+ jhyOrderService.confirmOrder(confirmDto);
+ return Result.success();
}
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmDto.java b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmDto.java
index c45f07a..73c0d4a 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmDto.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/dto/JhyOrderConfirmDto.java
@@ -19,4 +19,7 @@
@ApiModelProperty(value = "明细")
private List<JhyOrderConfirmItemsDto> items;
+
+ @ApiModelProperty(hidden = true)
+ private String userId;
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/mapper/AccountMapper.java b/gc-order/src/main/java/com/xzx/gc/order/mapper/AccountMapper.java
index ec4f43d..a55558e 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/mapper/AccountMapper.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/mapper/AccountMapper.java
@@ -34,4 +34,6 @@
UserAccountModel getAccountByUserId(String userId);
void updateUserAccount(@Param("accountId") String accountId, @Param("money") String money, @Param("overdraftLimit") String overdraftLimit);
+
+ AccountInfo selectAccountInfoByUserId(@Param("userId") String userId);
}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/mapper/ScoreDetailsMapper.java b/gc-order/src/main/java/com/xzx/gc/order/mapper/ScoreDetailsMapper.java
new file mode 100644
index 0000000..75237a3
--- /dev/null
+++ b/gc-order/src/main/java/com/xzx/gc/order/mapper/ScoreDetailsMapper.java
@@ -0,0 +1,7 @@
+package com.xzx.gc.order.mapper;
+
+import com.xzx.gc.entity.ScoreDetails;
+import com.xzx.gc.util.GcMapper;
+
+public interface ScoreDetailsMapper extends GcMapper<ScoreDetails> {
+}
diff --git a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
index 599c89d..4841c1b 100644
--- a/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
+++ b/gc-order/src/main/java/com/xzx/gc/order/service/JhyOrderService.java
@@ -9,6 +9,8 @@
import com.xzx.gc.common.utils.IdUtils;
import com.xzx.gc.entity.*;
import com.xzx.gc.order.dto.AddJhyOrderDto;
+import com.xzx.gc.order.dto.JhyOrderConfirmDto;
+import com.xzx.gc.order.dto.JhyOrderConfirmItemsDto;
import com.xzx.gc.order.dto.JhyOrderListDto;
import com.xzx.gc.order.mapper.*;
import com.xzx.gc.order.vo.JhyOrderDetailsVo;
@@ -43,6 +45,12 @@
@Autowired
private JhyInfoMapper jhyInfoMapper;
+
+ @Autowired
+ private AccountMapper accountMapper;
+
+ @Autowired
+ private ScoreDetailsMapper scoreDetailsMapper;
@Autowired
private IdUtils idUtils;
@@ -100,11 +108,6 @@
}
public PageInfo<JhyOrderListVo> orderList(JhyOrderListDto orderListDto) {
- JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(orderListDto.getUserId());
- if (jhyInfo == null || !JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
- throw new RestException(-3, "不是集货员");
- }
-
PageHelper.startPage(orderListDto.getPageNo(), orderListDto.getPageSize());
List<JhyOrderListVo> data = jhyOrderMapper.selectJhyOrderList(orderListDto);
return new PageInfo<>(data);
@@ -154,4 +157,49 @@
order.setStatus(JhyOrder.ORDER_STATUS_CANCEL);
jhyOrderMapper.updateByPrimaryKey(order);
}
+
+ public void confirmOrder(JhyOrderConfirmDto confirmDto) {
+ JhyInfo jhyInfo = jhyInfoMapper.selectJhyInfoByUserId(confirmDto.getUserId());
+ if (jhyInfo == null || !JhyInfo.CHECK_PASS.equals(jhyInfo.getStatus())) {
+ throw new RestException(-3, "不是集物员");
+ }
+
+ JhyOrder order = jhyOrderMapper.selectByPrimaryKey(confirmDto.getOrderId());
+ order.setStatus(JhyOrder.ORDER_STATUS_CONFIRM);
+ order.setReceivingTime(new Date());
+ jhyOrderMapper.updateByPrimaryKey(order);
+
+ BigDecimal totalScore = BigDecimal.ZERO;
+ for (JhyOrderConfirmItemsDto item : confirmDto.getItems()) {
+ JhyOrderItems orderItem = jhyOrderItemsMapper.selectByPrimaryKey(item.getId());
+ BigDecimal total = orderItem.getPrice().multiply(BigDecimal.valueOf(40)).multiply(new BigDecimal(item.getWeight()));
+ orderItem.setScore(total.setScale(0, BigDecimal.ROUND_DOWN).toString());
+ orderItem.setWeight(new BigDecimal(item.getWeight()));
+ jhyOrderItemsMapper.updateByPrimaryKey(orderItem);
+
+ totalScore = totalScore.add(total);
+ }
+
+ AccountInfo jhyAccount = accountMapper.selectAccountInfoByUserId(order.getJhyId());
+ BigDecimal jhyScore = StrUtil.isBlank(jhyAccount.getCollectScore()) ? BigDecimal.ZERO : new BigDecimal(jhyAccount.getCollectScore());
+ ScoreDetails jhyScoreDetail = new ScoreDetails();
+ jhyScoreDetail.setOrderNo(order.getOrderNo());
+ jhyScoreDetail.setUserId(order.getJhyId());
+ jhyScoreDetail.setType(ScoreDetails.SCORE_TYPE_PAY);
+ jhyScoreDetail.setChangeScore(totalScore.negate());
+ jhyScoreDetail.setOriginalScore(jhyScore);
+ jhyScoreDetail.setCurrentScore(jhyScore.subtract(totalScore));
+ scoreDetailsMapper.insert(jhyScoreDetail);
+
+ AccountInfo userAccount = accountMapper.selectAccountInfoByUserId(order.getUserId());
+ BigDecimal userScore = StrUtil.isBlank(userAccount.getCollectScore()) ? BigDecimal.ZERO : new BigDecimal(userAccount.getCollectScore());
+ ScoreDetails userScoreDetail = new ScoreDetails();
+ userScoreDetail.setOrderNo(order.getOrderNo());
+ userScoreDetail.setUserId(order.getJhyId());
+ userScoreDetail.setType(ScoreDetails.SCORE_TYPE_EXCHANGE);
+ userScoreDetail.setChangeScore(totalScore);
+ userScoreDetail.setOriginalScore(userScore);
+ userScoreDetail.setCurrentScore(userScore.add(totalScore));
+ scoreDetailsMapper.insert(userScoreDetail);
+ }
}
diff --git a/gc-order/src/main/resources/mapper/order/AccountMapper.xml b/gc-order/src/main/resources/mapper/order/AccountMapper.xml
index 0a1e6f5..3fa509e 100644
--- a/gc-order/src/main/resources/mapper/order/AccountMapper.xml
+++ b/gc-order/src/main/resources/mapper/order/AccountMapper.xml
@@ -89,4 +89,7 @@
</update>
+ <select id="selectAccountInfoByUserId" resultType="com.xzx.gc.entity.AccountInfo">
+ select * from xzx_account_info where user_id=#{userId}
+ </select>
</mapper>
diff --git a/gc-order/src/main/resources/mapper/order/ScoreDetailsMapper.xml b/gc-order/src/main/resources/mapper/order/ScoreDetailsMapper.xml
new file mode 100644
index 0000000..80a632c
--- /dev/null
+++ b/gc-order/src/main/resources/mapper/order/ScoreDetailsMapper.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.xzx.gc.order.mapper.ScoreDetailsMapper">
+
+</mapper>
\ No newline at end of file
--
Gitblit v1.9.1