dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pos支付bug

Browse Source
This commit is contained in:
齐天大圣 2024-06-04 16:32:09 +08:00
parent 2f46dc8974
commit 71df91b54a
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java
View File

@ -32,6 +32,8 @@ import com.fuint.business.marketingActivity.cardFuleOrders.service.CardFuleOrder
import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord;
import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapper; import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapper;
import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService; import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService;
import com.fuint.business.marketingActivity.cardValueOrders.entity.CardValueOrders;
import com.fuint.business.marketingActivity.cardValueOrders.mapper.CardValueOrdersMapper;
import com.fuint.business.marketingActivity.cardValueOrders.service.CardValueOrdersService; import com.fuint.business.marketingActivity.cardValueOrders.service.CardValueOrdersService;
import com.fuint.business.member.entity.LJStaff; import com.fuint.business.member.entity.LJStaff;
import com.fuint.business.member.service.ILJStaffService; import com.fuint.business.member.service.ILJStaffService;
@ -53,6 +55,7 @@ import com.fuint.business.userManager.vo.LJUserVo;
import com.fuint.common.util.RedisLock; import com.fuint.common.util.RedisLock;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.ObjectUtils; import org.apache.commons.lang3.ObjectUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -269,6 +272,12 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
if ("CASH".equals(cardFuelRecordDTO.getPaymentType())) { if ("CASH".equals(cardFuelRecordDTO.getPaymentType())) {
AllOrderInfo allOrderInfo = getAllOrderInfo(cardFuelRecordDTO); AllOrderInfo allOrderInfo = getAllOrderInfo(cardFuelRecordDTO);
allOrderInfoService.insertAllOrderInfo(allOrderInfo); allOrderInfoService.insertAllOrderInfo(allOrderInfo);
CardValueOrders cardValueOrders = new CardValueOrders();
BeanUtils.copyProperties(allOrderInfo, cardValueOrders);
cardValueOrders.setPayAmount(allOrderInfo.getPayMoney());
cardValueOrders.setDiscount(allOrderInfo.getDiscountAmount());
cardValueOrders.setAmount(allOrderInfo.getPayMoney());
cardValueOrdersMapper.insert(cardValueOrders);
cardValueOrdersService.updateBalances(orderNo,"paid"); cardValueOrdersService.updateBalances(orderNo,"paid");
} }
@ -317,6 +326,8 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService {
return cardFuelRecordDTO; return cardFuelRecordDTO;
} }
@Resource
private CardValueOrdersMapper cardValueOrdersMapper;
private static AllOrderInfo getAllOrderInfo(CardFuelRecordDTO cardFuelRecordDTO) { private static AllOrderInfo getAllOrderInfo(CardFuelRecordDTO cardFuelRecordDTO) {
AllOrderInfo allOrderInfo = new AllOrderInfo(); AllOrderInfo allOrderInfo = new AllOrderInfo();

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/controller/CardValueOrdersController.java
View File

@ -116,15 +116,15 @@ public class CardValueOrdersController extends BaseController {
@PostMapping("getOneByOrderNo") @PostMapping("getOneByOrderNo")
public void getOneByOrderNo(@RequestBody Map<String,String> map){ public ResponseObject getOneByOrderNo(@RequestBody Map<String,String> map){
String orderNo = map.get("orderNo"); String orderNo = map.get("orderNo");
cardValueOrdersService.getOneByOrderNo(orderNo); return getSuccessResult(cardValueOrdersService.getOneByOrderNo(orderNo));
} }
@PostMapping("getOneByOrderNos") /*@PostMapping("getOneByOrderNos")
public ResponseObject getOneByOrderNos(@RequestBody Map<String,String> map){ public ResponseObject getOneByOrderNos(@RequestBody Map<String,String> map){
String orderNo = map.get("orderNo"); String orderNo = map.get("orderNo");
return getSuccessResult(cardValueOrdersService.getOneByOrderNos(orderNo)); return getSuccessResult(cardValueOrdersService.getOneByOrderNos(orderNo));
} }*/
} }