提交代码

bweb/src/main/java/com/bweb/config/AuthConfig.java

@@ -94,6 +94,7 @@ public class AuthConfig implements WebMvcConfigurer {
 				.excludePathPatterns("/agentMer/*")
 				.excludePathPatterns("/newLinkNotify/*")
 				.excludePathPatterns("/merchantPayConfig/editConfig")
+				.excludePathPatterns("/test/*")
 		;
 	}
 

bweb/src/main/java/com/bweb/controller/BsAgentMerAccountController.java

@@ -116,11 +116,12 @@ public class BsAgentMerAccountController {
 
             } else if (SecUserObjectTypeEnum.type5.getCode() == userSession.getAccount().getObjectType()) {
                 // 查询代理商工作人员
-                BsAgentStaff agentStaff = agentStaffService.getStaffDetailById(userSession.getAccount().getId());
+                BsAgentStaff agentStaff = agentStaffService.getStaffDetailById(userSession.getAccount().getObjectId());
                 if (agentStaff == null) {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
                 }
                 param.put("agentId", agentStaff.getAgentId());
+                param.put("agentStaffId", agentStaff.getId());
             } else {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.ROLE_NOT_PERMISSIONS, "");
             }

bweb/src/main/java/com/bweb/controller/TestController.java

@@ -0,0 +1,75 @@
+package com.bweb.controller;
+
+import com.alibaba.fastjson.JSONObject;
+import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
+import com.hfkj.channel.gas.shell.CqShellPetroleumRequestService;
+import com.hfkj.common.exception.ErrorCode;
+import com.hfkj.common.exception.ErrorHelp;
+import com.hfkj.common.exception.SysCode;
+import com.hfkj.common.utils.HttpUtils;
+import com.hfkj.common.utils.HttpsUtils;
+import com.hfkj.common.utils.MD5Util;
+import com.hfkj.common.utils.ResponseMsgUtil;
+import com.hfkj.entity.BsGasOrder;
+import com.hfkj.entity.SecUser;
+import com.hfkj.model.ResponseData;
+import com.hfkj.service.sec.SecUserLoginLogService;
+import com.hfkj.service.sec.SecUserService;
+import com.hfkj.sysenum.SecUserObjectTypeEnum;
+import com.hfkj.sysenum.SecUserStatusEnum;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.HashMap;
+import java.util.Map;
+
+@Controller
+@RequestMapping(value="/test")
+@Api(value="测试")
+public class TestController {
+	Logger log = LoggerFactory.getLogger(TestController.class);
+
+	@Resource
+	private SecUserService secUserService;
+	@Resource
+	private SecUserLoginLogService secUserLoginLogService;
+
+	@RequestMapping(value="/editUser",method = RequestMethod.GET)
+	@ResponseBody
+	@ApiOperation(value = "编辑用户")
+	public ResponseData editUser() {
+		try {
+
+			JSONObject response = HttpsUtils.doGet("https://oil.dctpay.com/crest/gasOrder/queryOilOrder?orderNo=240804110524374697");
+
+			BsGasOrder gasOrder = JSONObject.parseObject(response.getJSONObject("return_data").toJSONString(), BsGasOrder.class);
+
+			// 推送加好油【重庆壳牌】
+			JSONObject object = CqShellPetroleumRequestService.gasSyncPayment(gasOrder.getOrderNo(),
+					gasOrder.getMerNo(),
+					gasOrder.getPayTime(),
+					gasOrder.getGasRefuelPrice(),
+					gasOrder.getGasOilNo(),
+					gasOrder.getGasGunNo(),
+					gasOrder.getPayablePrice(),
+					gasOrder.getTotalDeductionPrice()
+			);
+
+			return ResponseMsgUtil.success(object);
+
+		} catch (Exception e) {
+			log.error("error!",e);
+			return ResponseMsgUtil.exception(e);
+		}
+	}
+
+
+
+}

schedule/src/main/java/com/hfkj/schedule/OrderSchedule.java

@@ -0,0 +1,36 @@
+package com.hfkj.schedule;
+
+import com.hfkj.service.order.BsOrderService;
+import org.apache.commons.collections4.MapUtils;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 订单结算业务
+ * @className: OrderSettleService
+ * @author: HuRui
+ * @date: 2024/6/25
+ **/
+@Component
+public class OrderSchedule {
+    @Resource
+    private BsOrderService orderService;
+
+    @Scheduled(cron="0 0/1 * * * ?")   //每分钟执行一次
+    public void cancel() {
+        List<Map<String, Object>> orderList = orderService.getNeedCancelOrderList();
+        for (Map<String,Object> param : orderList) {
+            try {
+                // 取消订单
+                orderService.cancel(MapUtils.getString(param, "orderNo"));
+
+            } catch (Exception e) {
+                System.out.println(MapUtils.getString(param, "orderNo")+"，取消订单失败！");
+            }
+        }
+    }
+}

service/src/main/java/com/hfkj/dao/BsAgentMerAccountMapperExt.java

@@ -24,10 +24,11 @@ public interface BsAgentMerAccountMapperExt {
             " bs_agent_mer_account a" +
             " LEFT JOIN bs_merchant b ON a.mer_no = b.mer_no" +
             " where 1 = 1" +
+            " <if test='param.agentStaffId != null'>  and mer_id in (select mer_id from bs_agent_mer where agent_staff_id = #{param.agentStaffId} and `status` = 1) </if>" +
             " <if test='param.provinceCode != null'> and b.province_code = #{param.provinceCode} </if>" +
             " <if test='param.cityCode != null'> and b.city_code = #{param.cityCode} </if>" +
             " <if test='param.areaCode != null'> and b.area_code = #{param.areaCode} </if>" +
-            " <if test='param.agentId != null'> and b.agent_id = #{param.agentId} </if>" +
+            " <if test='param.agentId != null'> and a.agent_id = #{param.agentId} </if>" +
             " <if test='param.merNo != null'> and b.mer_no like concat('%',#{param.merNo},'%') </if>" +
             " <if test='param.merName != null'> and b.mer_name like concat('%',#{param.merName},'%') </if>" +
             " ORDER BY a.amount asc" +

service/src/main/java/com/hfkj/dao/BsOrderMapperExt.java

@@ -1,7 +1,18 @@
 package com.hfkj.dao;
 
+import org.apache.ibatis.annotations.Select;
+
+import java.util.List;
+import java.util.Map;
+
 /**
  * mapper扩展类
  */
 public interface BsOrderMapperExt {
+    
+    @Select(" select a.orderNo,a.timestampdiff " +
+            " from (select order_no orderNo, TIMESTAMPDIFF(MINUTE,create_time,NOW()) timestampdiff from bs_order where order_status = 1) a " +
+            " where a.timestampdiff > 10")
+    List<Map<String,Object>> selectNeedCancelOrderList();
+
 }

service/src/main/java/com/hfkj/service/agent/BsAgentMerAccountService.java

@@ -1,6 +1,7 @@
 package com.hfkj.service.agent;
 
 import com.hfkj.entity.BsAgentMerAccount;
+import com.hfkj.entity.BsAgentMerAccountRecord;
 import com.hfkj.entity.BsMerchantAccount;
 import com.hfkj.entity.BsOrderRefund;
 
@@ -67,6 +68,15 @@ public interface BsAgentMerAccountService {
      */
     void refund(Long agentId, String merNo, BigDecimal amount, BsOrderRefund orderRefund) throws Exception;
 
+    /**
+     * 是否交易
+     * @param agentId
+     * @param merNo
+     * @param orderNo
+     * @return
+     */
+    boolean isTrade(Long agentId, String merNo, String orderNo);
+
     /**
      * 查询商户列表
      * @param param

service/src/main/java/com/hfkj/service/agent/impl/BsAgentMerAccountRecordServiceImpl.java

@@ -69,13 +69,17 @@ public class BsAgentMerAccountRecordServiceImpl implements BsAgentMerAccountReco
         }
 
         if (MapUtils.getLong(param, "agentId") != null) {
-            criteria.andAgentMerAccountIdEqualTo(MapUtils.getLong(param, "agentId"));
+            criteria.andAgentIdEqualTo(MapUtils.getLong(param, "agentId"));
         }
 
         if (StringUtils.isNotBlank(MapUtils.getString(param, "merNo"))) {
             criteria.andMerNoEqualTo(MapUtils.getString(param, "merNo"));
         }
 
+        if (StringUtils.isNotBlank(MapUtils.getString(param, "orderNo"))) {
+            criteria.andSourceOrderNoEqualTo(MapUtils.getString(param, "orderNo"));
+        }
+
         example.setOrderByClause("create_time desc");
         return agentMerAccountRecordMapper.selectByExample(example);
     }

service/src/main/java/com/hfkj/service/agent/impl/BsAgentMerAccountServiceImpl.java

@@ -18,8 +18,10 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * @className: BsAgentMerAccountServiceImpl
@@ -178,10 +180,6 @@ public class BsAgentMerAccountServiceImpl implements BsAgentMerAccountService {
                 // 获取锁成功
                 // 查询账户
                 BsAgentMerAccount merAccount = getAccount(agentId, merNo);
-                // 余额 是否小于 消费余额
-                if (merAccount.getAmount().compareTo(amount) == -1) {
-                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "余额不足，暂时无法交易");
-                }
                 // 变更前金额
                 BigDecimal beforeAmount = merAccount.getAmount();
                 // 计算消费后金额
@@ -266,6 +264,38 @@ public class BsAgentMerAccountServiceImpl implements BsAgentMerAccountService {
         }
     }
 
+    @Override
+    public boolean isTrade(Long agentId, String merNo, String orderNo) {
+        Map<String,Object> param = new HashMap<>();
+        param.put("agentId", agentId);
+        param.put("merNo", merNo);
+        param.put("orderNo", orderNo);
+        // 查询订单扣款记录
+        List<BsAgentMerAccountRecord> list = agentMerAccountRecordService.getList(param);
+
+        // 结果
+        boolean result = false;
+        if (!list.isEmpty()) {
+            // 是否有交易
+            List<BsAgentMerAccountRecord> trade = list
+                    .stream().filter(o -> o.getType().equals(MerchantAccountRecordTypeEnum.type2.getType()))
+                    .collect(Collectors.toList());
+            if (!trade.isEmpty()) {
+                result = true;
+
+                // 是否有退款给商户
+                List<BsAgentMerAccountRecord> refund = list
+                        .stream().filter(o -> o.getType().equals(MerchantAccountRecordTypeEnum.type1.getType()))
+                        .collect(Collectors.toList());
+                if (!refund.isEmpty()) {
+                    // 有退款，为false  不可重复退款给商户
+                    result = false;
+                }
+            }
+        }
+        return result;
+    }
+
     @Override
     public List<Map<String, Object>> getMerList(Map<String, Object> param) {
         return agentMerAccountMapper.selectMerList(param);

service/src/main/java/com/hfkj/service/order/BsOrderService.java

@@ -81,5 +81,10 @@ public interface BsOrderService {
      */
     List<BsOrder> getOrderList(Map<String,Object> param);
 
+    /**
+     * 获取需求取消的订单列表
+     * @return
+     */
+    List<Map<String,Object>> getNeedCancelOrderList();
 
 }

service/src/main/java/com/hfkj/service/order/OrderCancelService.java

@@ -74,21 +74,23 @@ public class OrderCancelService {
 
             if (gasOrder.getAgentId() != null) {
                 try {
-                    // 家辉代理商商户金额
+                    // 是否可以退款
-                    Map<String,Object> param = new HashMap<>();
+                    boolean isTrade = agentMerAccountService.isTrade(gasOrder.getAgentId(), gasOrder.getMerNo(), gasOrder.getOrderNo());
-                    param.put("sourceType", MerchantAccountRecordSourceTypeEnum.type4.getType());
+                    if (isTrade) {
-                    param.put("sourceOrderNo", gasOrder.getOrderNo());
+                        // 代理商商户金额
-                    param.put("sourceOrderContent", "取消加油订单："+gasOrder.getOrderNo()+"，金额：￥" + gasOrder.getGasRefuelPrice());
+                        Map<String,Object> param = new HashMap<>();
-                    agentMerAccountService.orderCancel(gasOrder.getAgentId(), gasOrder.getMerNo(), gasOrder.getGasRefuelPrice(), param);
+                        param.put("sourceType", MerchantAccountRecordSourceTypeEnum.type4.getType());
+                        param.put("sourceOrderNo", gasOrder.getOrderNo());
+                        param.put("sourceOrderContent", "取消加油订单："+gasOrder.getOrderNo()+"，金额：￥" + gasOrder.getGasRefuelPrice());
+                        agentMerAccountService.orderCancel(gasOrder.getAgentId(), gasOrder.getMerNo(), gasOrder.getGasRefuelPrice(), param);
+                    }
                 } catch (BaseException e) {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, e.getErrorMsg());
                 } catch (Exception e) {
                     throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "扣款失败，请稍后重新提交订单");
                 }
-
             }
         }
     }
 
-
 }

service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java

@@ -12,6 +12,7 @@ import com.hfkj.model.order.OrderChildModel;
 import com.hfkj.model.order.OrderModel;
 import com.hfkj.mqtopic.OrderTopic;
 import com.hfkj.service.order.*;
+import com.hfkj.sysenum.merchant.MerchantAccountRecordTypeEnum;
 import com.hfkj.sysenum.order.OrderChildProductTypeEnum;
 import com.hfkj.sysenum.order.OrderChildStatusEnum;
 import com.hfkj.sysenum.order.OrderStatusEnum;
@@ -66,6 +67,9 @@ public class BsOrderServiceImpl implements BsOrderService {
     private OrderPaySuccessService orderPaySuccessService;
     @Resource
     private OrderCancelService orderCancelService;
+    @Resource
+    private RedisTemplate<String, Object> redisTemplate;
+
     public BsOrder editData(BsOrder order) {
         order.setUpdateTime(new Date());
         if (order.getId() == null) {
@@ -261,23 +265,29 @@ public class BsOrderServiceImpl implements BsOrderService {
     @Override
     @Transactional(propagation= Propagation.REQUIRES_NEW, rollbackFor= {RuntimeException.class}, timeout = 10)
     public OrderModel cancel(String orderNo) {
-        // 查询订单
+        // 锁编号
-        OrderModel order = getDetail(orderNo);
+        String lockKey = "ORDER_CANCEL_"+ orderNo;
-        if (order == null) {
+        // 获取锁
-            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的订单");
+        Boolean lock = redisTemplate.opsForValue().setIfAbsent(lockKey, "");
-        }
+        if (Boolean.TRUE.equals(lock)) {
-        if (!order.getOrderStatus().equals(OrderStatusEnum.status1.getCode())) {
+            try {
-            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法取消，订单不处于待支付状态");
+                // 获取锁成功
-        }
+                // 查询订单
-        order.setOrderStatus(OrderStatusEnum.status5.getCode());
+                OrderModel order = getDetail(orderNo);
-        order.setCancelTime(new Date());
+                if (order == null) {
-        editData(order);
+                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的订单");
-
+                }
-        for (BsOrderChild orderChild : order.getOrderChildList()) {
+                if (!order.getOrderStatus().equals(OrderStatusEnum.status1.getCode())) {
-            orderChild.setStatus(OrderChildStatusEnum.status5.getCode());
+                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "无法取消，订单不处于待支付状态");
-            orderChildService.editData(orderChild);
+                }
-        }
+                order.setOrderStatus(OrderStatusEnum.status5.getCode());
+                order.setCancelTime(new Date());
+                editData(order);
 
+                for (BsOrderChild orderChild : order.getOrderChildList()) {
+                    orderChild.setStatus(OrderChildStatusEnum.status5.getCode());
+                    orderChildService.editData(orderChild);
+                }
 /*        // 退回优惠券
         if (order.getDeduction().getUserCouponDiscountId() != null) {
             // 查询用户优惠券
@@ -317,13 +327,29 @@ public class BsOrderServiceImpl implements BsOrderService {
                     source
             );
         }*/
+                // 取消订单业务
+                orderCancelService.orderBusHandle(order);
 
-        // 取消订单业务
+                // 释放锁
-        orderCancelService.orderBusHandle(order);
+                redisTemplate.delete(lockKey);
 
-        // 更新缓存
+                // 更新缓存
-        cache(order);
+                cache(order);
-        return order;
+                return order;
+
+            } catch (Exception e) {
+                // 释放锁
+                redisTemplate.delete(lockKey);
+
+                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "取消失败！未知原因");
+            }
+        } else {
+            try {
+                Thread.sleep(100);
+            } catch (Exception e) {}
+            cancel(orderNo);
+        }
+        return null;
     }
 
     @Override
@@ -464,4 +490,9 @@ public class BsOrderServiceImpl implements BsOrderService {
         return orderMapper.selectByExample(example);
     }
 
+    @Override
+    public List<Map<String, Object>> getNeedCancelOrderList() {
+        return orderMapper.selectNeedCancelOrderList();
+    }
+
 }