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

bug

Browse Source
This commit is contained in:
齐天大圣 2024-03-19 09:38:34 +08:00
parent c25d20b87b
commit 55be54b4ad
21 changed files with 59 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/controller/FyPayController.java
View File

@ -57,7 +57,7 @@ public class FyPayController {
// 接收支付平台异步通知的接口
@PostMapping("/notify")
public String notifyUrl(HttpServletRequest request,HttpServletResponse response) throws UnsupportedEncodingException, JsonProcessingException {
public String notifyUrl(HttpServletRequest request,HttpServletResponse response) throws Exception {
System.out.println("----------------收到支付回调--------"+request.getParameter("req"));
String notifyData = request.getParameter("req");
String decode = URLDecoder.decode(notifyData, Const.charset);
@ -96,7 +96,7 @@ public class FyPayController {
return "0";
}
}
public void updateOrderStatus(String orderNo,String type) throws JsonProcessingException {
public void updateOrderStatus(String orderNo,String type) throws Exception {
if ("1".equals(type)) {
orderService.updateOrderStatus(orderNo,"paid");
}else if ("4".equals(type)) {
@ -109,4 +109,4 @@ public class FyPayController {
cardFuelRecordService.fuleRechargeFinallDeal(orderNo);
}
}
}
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/controller/IntegralOrdersController.java
View File

@ -152,13 +152,13 @@ public class IntegralOrdersController extends BaseController {
* @return
*/
@GetMapping("checkTheStatusOfYourPaymentByIntegral")
public ResponseObject checkTheStatusOfYourPaymentByIntegral(@Param("orderNumber") String orderNumber) {
public ResponseObject checkTheStatusOfYourPaymentByIntegral(@Param("orderNumber") String orderNumber) throws Exception {
return getSuccessResult(this.integralOrdersService.checkTheStatusOfYourPaymentByIntegral(orderNumber));
}
@PostMapping("integralOrdersProcessingUni")
public ResponseObject integralOrdersProcessingUni(@RequestBody IntegralOrdersRequest integralOrdersList) {
public ResponseObject integralOrdersProcessingUni(@RequestBody IntegralOrdersRequest integralOrdersList) throws Exception {
return getSuccessResult(this.integralOrdersService.integralOrdersProcessingUni(integralOrdersList));
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/IntegralOrdersService.java
View File

@ -70,12 +70,12 @@ public interface IntegralOrdersService {
IntegralOrders integralOrdersProcessing(IntegralOrdersRequest integralOrdersList);
IntegralOrders checkTheStatusOfYourPaymentByIntegral(String orderNO);
IntegralOrders checkTheStatusOfYourPaymentByIntegral(String orderNO) throws Exception;
int editPayStatus(String orderNumber, String payStates,Integer storeId);
Map<String, Object> integralOrdersProcessingUni(IntegralOrdersRequest integralOrdersList);
Map<String, Object> integralOrdersProcessingUni(IntegralOrdersRequest integralOrdersList) throws Exception;
/**
* 查询是否领取到同一件商品领取了几件

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralOrdersServiceImpl.java
View File

@ -308,7 +308,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
private RedisLock redisLock;
@Override
@Transactional
public IntegralOrders checkTheStatusOfYourPaymentByIntegral(String orderNo) {
public IntegralOrders checkTheStatusOfYourPaymentByIntegral(String orderNo) throws Exception {
// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
// 查询订单信息
@ -439,7 +439,7 @@ public class IntegralOrdersServiceImpl implements IntegralOrdersService {
@Override
public Map<String, Object> integralOrdersProcessingUni(IntegralOrdersRequest integralOrdersList) {
public Map<String, Object> integralOrdersProcessingUni(IntegralOrdersRequest integralOrdersList) throws Exception {
double epsilon = 1e-10; // 阈值
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/ActiveExchangeService.java
View File

@ -61,5 +61,5 @@ public interface ActiveExchangeService {
* 消费有礼后续处理
* @param paymentActiveDTO
*/
void activeConsumption(PaymentActiveDTO paymentActiveDTO);
void activeConsumption(PaymentActiveDTO paymentActiveDTO) throws Exception;
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeExchange/service/impl/ActiveExchangeServiceImpl.java
View File

@ -983,7 +983,7 @@ public class ActiveExchangeServiceImpl implements ActiveExchangeService {
}
@Override
public void activeConsumption (PaymentActiveDTO paymentActiveDTO){
public void activeConsumption (PaymentActiveDTO paymentActiveDTO) throws Exception {
//消费有礼
ArrayList<ActiveConsumptionVO> activeConsumptionVOS1 = new ArrayList<>();
List<ActiveConsumptionVO> activeConsumptionVOS = oilOrderMapper.selectActiveConsumption(paymentActiveDTO.getStoreId(), paymentActiveDTO.getAmount());

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/controller/ActiveRecommendRecordsController.java
View File

@ -71,7 +71,7 @@ public class ActiveRecommendRecordsController extends BaseController {
* @return 新增结果
*/
@PostMapping
public ResponseObject insert(@RequestBody ActiveRecommendRecordsDTO activeRecommendRecordsDTO) {
public ResponseObject insert(@RequestBody ActiveRecommendRecordsDTO activeRecommendRecordsDTO) throws Exception {
return getSuccessResult(this.activeRecommendRecordsService.add(activeRecommendRecordsDTO));
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/ActiveRecommendRecordsService.java
View File

@ -33,6 +33,6 @@ public interface ActiveRecommendRecordsService extends IService<ActiveRecommendR
* @param activeRecommendRecordsDTO
* @return
*/
boolean add(ActiveRecommendRecordsDTO activeRecommendRecordsDTO);
boolean add(ActiveRecommendRecordsDTO activeRecommendRecordsDTO) throws Exception;
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/activeRecommend/service/impl/ActiveRecommendRecordsServiceImpl.java
View File

@ -156,7 +156,7 @@ public class ActiveRecommendRecordsServiceImpl extends ServiceImpl<ActiveRecomme
*/
@Override
@Transactional
public boolean add(ActiveRecommendRecordsDTO activeRecommendRecordsDTO) {
public boolean add(ActiveRecommendRecordsDTO activeRecommendRecordsDTO) throws Exception {
log.info("邀请有礼");
if (ObjectUtils.isNotEmpty(activeRecommendRecordsDTO) && activeRecommendRecordsDTO.getType().equals("yaoqingyouli")){
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/controller/CardFavorableRecordController.java
View File

@ -104,7 +104,7 @@ public class CardFavorableRecordController extends BaseController {
* @return 新增结果
*/
@PostMapping("issueCardFavorable")
public ResponseObject issueCardFavorable(@RequestBody CardFavorableAdnUserDTO cardFavorableAdnUserDTO) {
public ResponseObject issueCardFavorable(@RequestBody CardFavorableAdnUserDTO cardFavorableAdnUserDTO) throws Exception {
return getSuccessResult(this.cardFavorableRecordService.issueCardFavorable(cardFavorableAdnUserDTO));
}
@ -160,7 +160,7 @@ public class CardFavorableRecordController extends BaseController {
* @return 修改结果
*/
@PostMapping("updateCardAndActiveById")
public ResponseObject updateCardAndActiveById(@RequestBody PaymentActiveVO paymentActiveVO) {
public ResponseObject updateCardAndActiveById(@RequestBody PaymentActiveVO paymentActiveVO) throws Exception {
return getSuccessResult(this.cardFavorableRecordService.updateCardAndActiveById(paymentActiveVO));
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/entity/CardFavorableRecord.java
View File

@ -58,5 +58,11 @@ public class CardFavorableRecord extends Model<CardFavorableRecord> {
//更新时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
private Date updateTime;
//优惠金额
private Double discountAmount;
//满足金额
private Double satisfiedAmount;
//折扣抵消
private Double discountOffset;
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/CardFavorableRecordService.java
View File

@ -59,21 +59,21 @@ public interface CardFavorableRecordService extends IService<CardFavorableRecord
* @param cardFavorableRecord
* @return
*/
boolean addCardFavorableRecord(CardFavorableRecord cardFavorableRecord);
boolean addCardFavorableRecord(CardFavorableRecord cardFavorableRecord) throws Exception;
/**
* 核销
* @param paymentActiveVO
* @return
*/
boolean updateCardAndActiveById(PaymentActiveVO paymentActiveVO);
boolean updateCardAndActiveById(PaymentActiveVO paymentActiveVO) throws Exception;
/**
* pc端一键发券接口
* @param cardFavorableAdnUserDTO
* @return
*/
boolean issueCardFavorable(CardFavorableAdnUserDTO cardFavorableAdnUserDTO);
boolean issueCardFavorable(CardFavorableAdnUserDTO cardFavorableAdnUserDTO) throws Exception;
CardFavorableAdnUserDTO getInfoById(Integer id);

15
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/service/impl/CardFavorableRecordServiceImpl.java
View File

@ -258,9 +258,14 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
* @return
*/
@Override
public boolean addCardFavorableRecord(CardFavorableRecord cardFavorableRecord) {
public boolean addCardFavorableRecord(CardFavorableRecord cardFavorableRecord) throws Exception {
CardFavorable cardFavorable = cardFavorableService.getById(cardFavorableRecord.getCardFavorableId());
if (ObjectUtils.isNotEmpty(cardFavorable)){
//优惠券的数量
Integer count = cardFavorable.getCount();
if (count < 1){
throw new Exception("优惠券已领完");
}
//优惠券开始结束时间
if (ObjectUtils.isNotEmpty(cardFavorable) && ObjectUtils.isNotEmpty(cardFavorable.getTimeType())) {
if (cardFavorable.getTimeType().equals("0")) {
@ -283,9 +288,13 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
Date froms = Date.from(localDates.atStartOfDay(ZoneId.systemDefault()).toInstant());
cardFavorableRecord.setStartTime(froms);
cardFavorableRecord.setEndTime(from);
cardFavorable.setCount(count-1);
}
}
}
cardFavorableService.updateById(cardFavorable);
cardFavorableRecord.setSatisfiedAmount(cardFavorable.getSatisfiedAmount());
cardFavorableRecord.setDiscountAmount(cardFavorable.getDiscountAmount());
return save(cardFavorableRecord);
}
@ -296,7 +305,7 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
*/
@Override
@Transactional
public boolean updateCardAndActiveById(PaymentActiveVO paymentActiveVO) {
public boolean updateCardAndActiveById(PaymentActiveVO paymentActiveVO) throws Exception {
//优惠券
boolean flag = false;
Integer userId = null;
@ -342,7 +351,7 @@ public class CardFavorableRecordServiceImpl extends ServiceImpl<CardFavorableRec
* @return
*/
@Override
public boolean issueCardFavorable(CardFavorableAdnUserDTO cardFavorableAdnUserDTO) {
public boolean issueCardFavorable(CardFavorableAdnUserDTO cardFavorableAdnUserDTO) throws Exception {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer activeId = cardFavorableAdnUserDTO.getActiveId();
LambdaQueryWrapper<ActiveOneCoupon> queryWrapper = new LambdaQueryWrapper<>();

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFavorable/vo/CardFavorableRecordVO.java
View File

@ -18,10 +18,6 @@ public class CardFavorableRecordVO extends CardFavorableRecord {
* 满减金额
*/
private double fullDeduction;
/**
* 优惠金额
*/
private double discountAmount;
/**
* 优惠折扣
*/
@ -43,8 +39,6 @@ public class CardFavorableRecordVO extends CardFavorableRecord {
private String oilName;
//优惠类型 0：满减券 1：折扣券
private String discountType;
//满足金额
private double satisfiedAmount;
//优惠券描述信息
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java
View File

@ -141,7 +141,7 @@ public class CardValueRecordController extends BaseController {
* @return
*/
@GetMapping("checkTheStatusOfYourPayment")
public ResponseObject checkTheStatusOfYourPayment(Integer id) {
public ResponseObject checkTheStatusOfYourPayment(Integer id) throws Exception {
return getSuccessResult(this.cardValueRecordService.checkTheStatusOfYourPayment(id));
}
@ -196,7 +196,7 @@ public class CardValueRecordController extends BaseController {
* @return
*/
@GetMapping("/testCharge/{orderNo}")
public void testCharge(@PathVariable String orderNo) {
public void testCharge(@PathVariable String orderNo) throws Exception {
this.cardValueRecordService.rechargeFinallDeal(orderNo);
}

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
View File

@ -49,7 +49,7 @@ public interface CardValueRecordService extends IService<CardValueRecord> {
CardValueRecordDTO prepaidCardTopUp(CardValueRecordDTO cardValueRecordDTO);
CardValueRecord checkTheStatusOfYourPayment(Integer id);
CardValueRecord checkTheStatusOfYourPayment(Integer id) throws Exception;
boolean editPayStatus(@Param("id") Integer id,@Param("payStates") String payStates);
@ -60,7 +60,7 @@ public interface CardValueRecordService extends IService<CardValueRecord> {
IPage<CardValueRecordDTO> selectAllRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord);
void export(HttpServletResponse response, CardValueRecord cardValueRecord);
void rechargeFinallDeal(String orderNo);
void rechargeFinallDeal(String orderNo) throws Exception;
/**
* 修改订单状态信息
@ -73,7 +73,7 @@ public interface CardValueRecordService extends IService<CardValueRecord> {
* 会员等级优惠送券
* @param userId
*/
void giveCoupon(Integer userId, Integer storeId, LJUserVo ljUserVos, LJStaff ljStaff);
void giveCoupon(Integer userId, Integer storeId, LJUserVo ljUserVos, LJStaff ljStaff) throws Exception;
/**
* 根据用户id查询当前的储值卡信息

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
View File

@ -494,7 +494,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
*/
@Override
@Transactional
public CardValueRecord checkTheStatusOfYourPayment(Integer id) {
public CardValueRecord checkTheStatusOfYourPayment(Integer id) throws Exception {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
CardValueRecord cardValueRecord = baseMapper.selectById(id);
@ -823,7 +823,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
* @param orderNo
*/
@Transactional
public void rechargeFinallDeal(String orderNo){
public void rechargeFinallDeal(String orderNo) throws Exception {
UserBalance userBalance1 = new UserBalance();
CardValueRecord cardValueRecord = new CardValueRecord();
CardBalanceChange cardBalanceChange = new CardBalanceChange();
@ -947,6 +947,8 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
cardFavorableRecord.setEndTime(from);
}
}
cardFavorableRecord.setSatisfiedAmount(cardValueVoucher.getSatisfiedAmount());
cardFavorableRecord.setDiscountAmount(cardValueVoucher.getDiscountAmount());
cardFavorableRecordService.save(cardFavorableRecord);
}
/*
@ -1054,7 +1056,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
}
@Override
public void giveCoupon(Integer userId,Integer storeId,LJUserVo ljUserVos,LJStaff ljStaff) {
public void giveCoupon(Integer userId,Integer storeId,LJUserVo ljUserVos,LJStaff ljStaff) throws Exception {
List<MtUserGradeChild> mtUserGradeChildren = userGradeChildService.selectListByUserId(userId,storeId);
if (CollectionUtils.isNotEmpty(mtUserGradeChildren)) {
for (MtUserGradeChild mtUserGradeChild : mtUserGradeChildren) {

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/OilOrderController.java
View File

@ -98,7 +98,7 @@ public class OilOrderController extends BaseController {
* @return
*/
@PostMapping
public ResponseObject add(@Validated @RequestBody Map<String,String> map){
public ResponseObject add(@Validated @RequestBody Map<String,String> map) throws Exception {
Map<String, Object> order = orderService.insertOilOrder(map);
return getSuccessResult(order);
}
@ -120,7 +120,7 @@ public class OilOrderController extends BaseController {
* @return
*/
@PostMapping("/appletPay")
public ResponseObject appletPay(@Validated @RequestBody Map<String,String> map){
public ResponseObject appletPay(@Validated @RequestBody Map<String,String> map) throws Exception {
return getSuccessResult(orderService.appletPay(map));
}
@ -179,7 +179,7 @@ public class OilOrderController extends BaseController {
* @return
*/
@PostMapping("/orderStatus")
public ResponseObject editStatus(@RequestBody Map<String,String> map){
public ResponseObject editStatus(@RequestBody Map<String,String> map) throws Exception {
String orderNo = map.get("orderNo");
String status = map.get("status");
return getSuccessResult(orderService.updateOrderStatus(orderNo,status));

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/OilOrderService.java
View File

@ -81,7 +81,7 @@ public interface OilOrderService extends IService<OilOrder> {
* @param map
* @return
*/
public Map<String,Object> insertOilOrder(Map<String ,String> map);
public Map<String,Object> insertOilOrder(Map<String ,String> map) throws Exception;
/**
* 消费有礼调用接口
@ -93,7 +93,7 @@ public interface OilOrderService extends IService<OilOrder> {
* @param orderAmount 订单金额
* @param oilId 油品id
*/
void updateCardAndActiveById(Integer storeId,Integer userId,Integer activeId,Integer cardFavorableId,String type,Double orderAmount,Double payAmount,Integer oilId);
void updateCardAndActiveById(Integer storeId,Integer userId,Integer activeId,Integer cardFavorableId,String type,Double orderAmount,Double payAmount,Integer oilId) throws Exception;
/**
* 扫描小程序中二维码所处理的逻辑
@ -112,7 +112,7 @@ public interface OilOrderService extends IService<OilOrder> {
* 小程序订单支付
* @param map
*/
public Map<String, Object> appletPay(Map<String,String> map);
public Map<String, Object> appletPay(Map<String,String> map) throws Exception;
/**
* 根据订单号修改订单支付状态
@ -120,7 +120,7 @@ public interface OilOrderService extends IService<OilOrder> {
* @param status
* @return
*/
public int updateOrderStatus(String orderNo,String status);
public int updateOrderStatus(String orderNo,String status) throws Exception;
/**
* 添加油品跟踪信息

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -243,7 +243,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
}
@Override
public Map<String,Object> insertOilOrder(Map<String ,String> map) {
public Map<String,Object> insertOilOrder(Map<String ,String> map) throws Exception {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
Integer storeId = nowAccountInfo.getStoreId();
// 油品订单信息
@ -557,7 +557,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
}
// 调用消费有礼接口
public void updateCardAndActiveById(Integer storeId,Integer userId,Integer activeId,Integer cardFavorableId,String type,Double orderAmount,Double payAmount,Integer oilId){
public void updateCardAndActiveById(Integer storeId,Integer userId,Integer activeId,Integer cardFavorableId,String type,Double orderAmount,Double payAmount,Integer oilId) throws Exception {
if (ObjectUtil.isNotEmpty(userId)){
LJUserVo userVo = userService.queryUserById(userId, storeId);
PaymentActiveVO paymentActiveVO = new PaymentActiveVO();
@ -1094,7 +1094,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
}
@Override
public Map<String, Object> appletPay(Map<String, String> map) {
public Map<String, Object> appletPay(Map<String, String> map) throws Exception {
String orderNo = map.get("orderNo");
// 支付金额
Double payAmount = Double.valueOf(map.get("payAmount"));
@ -1307,7 +1307,7 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> i
private CardValudChildrensService cardValudChildrensService;
@Override
public int updateOrderStatus(String orderNo, String status) {
public int updateOrderStatus(String orderNo, String status) throws Exception {
int row = 0;
OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo);
Integer userId = oilOrder.getUserId();

2
fuintBackend/fuint-application/src/main/java/com/fuint/system/dept/controller/SysDeptController.java
View File

@ -29,7 +29,7 @@ import java.util.List;
/**
* 部门信息
*
*
* @author ruoyi
*/
@RestController