Merge remote-tracking branch 'origin/sit' into sit

alien-store/src/main/java/shop/alien/store/controller/LifeUserOrderController.java

@@ -111,10 +111,10 @@ public class LifeUserOrderController {
             @ApiImplicitParam(name = "count", value = "数量", dataType = "int", paramType = "query", required = true)})
     @GetMapping("/buyCouponCheck")
     public R<Map<String, Object>> buyCouponCheck(@RequestParam("couponId") String couponId,
-                                               @RequestParam("couponType") Integer couponType,
-                                               @RequestParam("userId") String userId,
-                                               @RequestParam("storeId") String storeId,
-                                               @RequestParam("count") int count) {
+                                                 @RequestParam("couponType") Integer couponType,
+                                                 @RequestParam("userId") String userId,
+                                                 @RequestParam("storeId") String storeId,
+                                                 @RequestParam("count") int count) {
         log.info("userOrder.buyCouponCheck:couponId={}&couponType={}&userId={}&storeId={}&count={}", couponId, couponType, userId, storeId, count);
         return R.data(lifeUserOrderService.buyCouponCheck(couponId, couponType, userId, storeId, count));
     }
@@ -122,7 +122,7 @@ public class LifeUserOrderController {
     @ApiOperation("订单是否可以退款")
     @ApiOperationSupport(order = 4)
     @PostMapping("/refundCheck")
-    public R<Map<String, Object>> refundCheck(@RequestBody Map<String,String> refundOrder) {
+    public R<Map<String, Object>> refundCheck(@RequestBody Map<String, String> refundOrder) {
         log.info("UserOrderController.refundCheck?refundOrder={}", refundOrder.toString());
         return R.data(lifeUserOrderService.refundCheck(refundOrder));
     }
@@ -130,9 +130,9 @@ public class LifeUserOrderController {
     @ApiOperation("订单退款")
     @ApiOperationSupport(order = 5)
     @PostMapping("/requestRefund")
-    public R<Map<String, Object>> requestRefund(@RequestBody LifeRefundOrder refundOrder) {
+    public R<String> requestRefund(@RequestBody LifeRefundOrder refundOrder) {
         log.info("UserOrderController.requestRefund?refundOrder={}", refundOrder.toString());
-        return R.data(lifeUserOrderService.requestRefund(refundOrder));
+        return lifeUserOrderService.requestRefund(refundOrder);
     }
 
 

alien-store/src/main/java/shop/alien/store/controller/UserOrderController.java

@@ -89,9 +89,9 @@ public class UserOrderController {
     @ApiOperationSupport(order = 5)
     @PostMapping("/requestRefund")
     @Deprecated
-    public R<Map<String, Object>> requestRefund(LifeRefundOrder refundOrder) {
+    public R<String> requestRefund(LifeRefundOrder refundOrder) {
         log.info("UserOrderController.requestRefund?refundOrder={}", refundOrder.toString());
-        return R.data(userOrderService.requestRefund(refundOrder));
+        return userOrderService.requestRefund(refundOrder);
     }
 
     @GetMapping("getQuanCodeList")

alien-store/src/main/java/shop/alien/store/service/LifeUserOrderService.java

@@ -413,22 +413,19 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
      * @return
      */
     @Transactional(rollbackFor = Exception.class)
-    public Map<String, Object> requestRefund(LifeRefundOrder refundOrder) {
-        Map<String, Object> returnMap = new HashMap<>();
-        if (StringUtils.isEmpty(refundOrder.getRefundMoney()) ) {
-            returnMap.put("fail", "退款金额为null");
-            return returnMap;
+    public R<String> requestRefund(LifeRefundOrder refundOrder) {
+        if (StringUtils.isEmpty(refundOrder.getRefundMoney())) {
+            return R.fail("退款金额为null");
         }
         List<OrderCouponMiddle> orderCouponMiddles = orderCouponMiddleMapper.selectList(new QueryWrapper<OrderCouponMiddle>()
-                .eq("order_id", refundOrder.getOrderId()).eq("delete_flag",0));
+                .eq("order_id", refundOrder.getOrderId()).eq("delete_flag", 0));
         // 1.查询订单信息  订单表 + 中间表
         LifeUserOrder order = lifeUserOrderMapper.selectById(refundOrder.getOrderId());
         Integer refundCouponAmount = refundOrder.getRefundCouponAmount();
         // 待使用的券（可退款的券 || 退款失败的券 目前没做失败的券状态更新 暂时不加）
         List<OrderCouponMiddle> orderCouponMiddles1 = orderCouponMiddles.stream().filter(orderCouponMiddle -> orderCouponMiddle.getStatus() == OrderStatusEnum.WAIT_USE.getStatus()).collect(Collectors.toList());
         if (orderCouponMiddles1.size() < refundCouponAmount) {
-            returnMap.put("fail", "退款券数不足");
-            return returnMap;
+            return R.fail("退款券数不足");
         }
         // 判断累计退款金额
         BigDecimal totalRefundMoney = new BigDecimal(refundOrder.getRefundMoney());
@@ -440,25 +437,24 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
             totalRefundMoney = totalRefundMoney.add(new BigDecimal(lifeRefundOrder.getRefundMoney()));
             refundCouponCount += lifeRefundOrder.getRefundCouponAmount();
         }
-        if(totalRefundMoney.compareTo(new BigDecimal(order.getFinalPrice()))>0){
-            returnMap.put("fail","退款金额(已退+当前退)不能大于订单金额");
-            return returnMap;
+        if (totalRefundMoney.compareTo(new BigDecimal(order.getFinalPrice())) > 0) {
+            return R.fail("退款金额(已退+当前退)不能大于订单金额");
         }
         Date now = new Date();
         boolean ifPartialRefund = false;
         String PartialRefundCode = "";
         // 只要本次退款不是全退都是部分退
-        if (refundCouponAmount != orderCouponMiddles.size()){
+        if (refundCouponAmount != orderCouponMiddles.size()) {
             ifPartialRefund = true;
             PartialRefundCode = UniqueRandomNumGenerator.generateUniqueCode(12);
         }
-        String result = aliApi.processRefund(order.getOrderNo(), refundOrder.getRefundMoney(), refundOrder.getDescription(),PartialRefundCode);
+        String result = aliApi.processRefund(order.getOrderNo(), refundOrder.getRefundMoney(), refundOrder.getDescription(), PartialRefundCode);
         String refundMessage = "";
 
         // 更新的中间表id
         List<Integer> updateIds = orderCouponMiddles1.stream().limit(refundCouponAmount).map(x -> x.getId()).collect(Collectors.toList());
         if (result.equals("调用失败")) {
-            refundMessage = "编号为"+order.getOrderNo()+"的订单退款失败，请重新发起申请。";
+            refundMessage = "编号为" + order.getOrderNo() + "的订单退款失败，请重新发起申请。";
             // TODO 退款失败目前不做处理
             /*orderCouponMiddleMapper.update(null,new UpdateWrapper<OrderCouponMiddle>().in("id",updateIds)
                     .set("status",OrderStatusEnum.REFUND_FAILED.getStatus())
@@ -467,39 +463,38 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
                     .set("refund_reason",refundOrder.getReason()));
             // 退款记录
             refundOrder.setApplicationTime(now).setRefundTime(now).setStatus(1);*/
-            returnMap.put("success", refundMessage);
-            return returnMap;
+            return R.fail(refundMessage);
         } else {
-            refundMessage = "编号为"+order.getOrderNo()+"的订单已退款成功，退款金额"+refundOrder.getRefundMoney()+"元，已返还至您的支付渠道，请注意查收";
-            orderCouponMiddleMapper.update(null,new UpdateWrapper<OrderCouponMiddle>().in("id",updateIds)
-                    .set("status",OrderStatusEnum.REFUND.getStatus())
-                    .set("refund_time",now)
-                    .set(ifPartialRefund,"partial_refund_code",PartialRefundCode)
-                    .set("refund_reason",refundOrder.getReason()));
+            refundMessage = "编号为" + order.getOrderNo() + "的订单已退款成功，退款金额" + refundOrder.getRefundMoney() + "元，已返还至您的支付渠道，请注意查收";
+            orderCouponMiddleMapper.update(null, new UpdateWrapper<OrderCouponMiddle>().in("id", updateIds)
+                    .set("status", OrderStatusEnum.REFUND.getStatus())
+                    .set("refund_time", now)
+                    .set(ifPartialRefund, "partial_refund_code", PartialRefundCode)
+                    .set("refund_reason", refundOrder.getReason()));
             // 退款记录
             refundOrder.setApplicationTime(now).setRefundTime(now).setStatus(0);
-            if(ifPartialRefund){
+            if (ifPartialRefund) {
                 refundOrder.setPartialRefundCode(PartialRefundCode);
             }
         }
         // 更新总订单数据（中间表数据+订单表数据：当已退款个数+当前退款个数=已使用的券数时，订单状态改为已退款）
         if (refundCouponCount + refundCouponAmount == orderCouponMiddles.size()) {
-            lifeUserOrderMapper.update(null,new UpdateWrapper<LifeUserOrder>().eq("id",order.getId())
-                    .set("status",OrderStatusEnum.REFUND.getStatus())
-                    .set("refund_time",now)
-                    .set("finish_time",now));
+            lifeUserOrderMapper.update(null, new UpdateWrapper<LifeUserOrder>().eq("id", order.getId())
+                    .set("status", OrderStatusEnum.REFUND.getStatus())
+                    .set("refund_time", now)
+                    .set("finish_time", now));
             if (null != order.getQuanId()) {
-                lifeDiscountCouponUserMapper.update(null,new UpdateWrapper<LifeDiscountCouponUser>().eq("id",order.getQuanId())
-                        .set("status",DiscountCouponEnum.WAITING_USED.getValue()).set("use_time",null));
-            }   else {
+                lifeDiscountCouponUserMapper.update(null, new UpdateWrapper<LifeDiscountCouponUser>().eq("id", order.getQuanId())
+                        .set("status", DiscountCouponEnum.WAITING_USED.getValue()).set("use_time", null));
+            } else {
                 // 处理 quanId 为 null 的情况，例如日志记录
                 log.error("更新优惠券状态失败");
             }
         } else if (refundCouponCount + refundCouponAmount != orderCouponMiddles.size() && refundCouponAmount == orderCouponMiddles1.size()) {
             // 累计退券个数+当前退券个数!=总个数 且 当前退券数量 = 可退券数
-            lifeUserOrderMapper.update(null,new UpdateWrapper<LifeUserOrder>().eq("id",order.getId())
-                    .set("status",OrderStatusEnum.COMPLETE.getStatus())
-                    .set("finish_time",now));
+            lifeUserOrderMapper.update(null, new UpdateWrapper<LifeUserOrder>().eq("id", order.getId())
+                    .set("status", OrderStatusEnum.COMPLETE.getStatus())
+                    .set("finish_time", now));
         }
 
         // 将退款记录插入到数据库中
@@ -535,19 +530,19 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         Integer couponId = orderCouponMiddle.getCouponId();
 
         restoreInventory(couponType, refundCouponAmount, couponId);
-        returnMap.put("success", refundMessage);
-        return returnMap;
+        return R.success(refundMessage);
     }
 
     /**
      * 退款,取消订单时候，恢复库存
-     * @param couponType 类型 1-代金券，2-团购
+     *
+     * @param couponType         类型 1-代金券，2-团购
      * @param refundCouponAmount 团购券/代金券张数
-     * @param couponId 团购券/代金券id
+     * @param couponId           团购券/代金券id
      */
     private void restoreInventory(Integer couponType, Integer refundCouponAmount, Integer couponId) {
-        try{
-            if( CouponTypeEnum.COUPON.getCode() == couponType){
+        try {
+            if (CouponTypeEnum.COUPON.getCode() == couponType) {
                 // 代金券信息
                 lifeCouponMapper.update(null, new LambdaUpdateWrapper<LifeCoupon>()
                         .setSql("single_qty=single_qty+" + refundCouponAmount)
@@ -576,13 +571,14 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
 
     /**
      * 退款检查
+     *
      * @param refundOrder
      * @return
      */
-    public Map<String, Object> refundCheck(Map<String,String> refundOrder) {
+    public Map<String, Object> refundCheck(Map<String, String> refundOrder) {
         Map<String, Object> returnMap = new HashMap<>();
         LifeUserOrder order = lifeUserOrderMapper.selectById(refundOrder.get("orderId"));
-        if( null == order){
+        if (null == order) {
             returnMap.put("success", "不可退款");
             returnMap.put("reason", "未查询到订单");
             return returnMap;
@@ -609,7 +605,7 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
      */
     public Integer getAvailableOrderNumByOrderNo(String orderNo) {
         // 统计可用优惠劵数量
-        return orderCouponMiddleMapper.selectCount(new QueryWrapper<OrderCouponMiddle>().inSql("id","select id from life_user_order where order_no = " + orderNo ));
+        return orderCouponMiddleMapper.selectCount(new QueryWrapper<OrderCouponMiddle>().inSql("id", "select id from life_user_order where order_no = " + orderNo));
     }
 
     public String exportExcel(String orderNo, String storeId, String quanName, String baojiaStatus, String status) throws IOException {
@@ -706,6 +702,7 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
 
     /**
      * 创建用户订单
+     *
      * @param lifeUserOrderDto 构造数据用
      */
     @Transactional(rollbackFor = Exception.class)
@@ -778,15 +775,15 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         }
         //4. 代金券/团购库存扣除 coupon_type 1 代金券 2团购
         int successful = 0;
-        if(lifeUserOrderDto.getCouponType() == 2){
+        if (lifeUserOrderDto.getCouponType() == 2) {
             // 团购库存扣除
             successful = lifeGroupBuyMainMapper.update(null, new UpdateWrapper<LifeGroupBuyMain>()
-                    .eq("id", lifeUserOrderDto.getCouponId()).ge("inventory_num",lifeUserOrderDto.getCount()).setSql("inventory_num = inventory_num - " + lifeUserOrderDto.getCount()));
+                    .eq("id", lifeUserOrderDto.getCouponId()).ge("inventory_num", lifeUserOrderDto.getCount()).setSql("inventory_num = inventory_num - " + lifeUserOrderDto.getCount()));
         } else {
             successful = lifeCouponMapper.update(null, new UpdateWrapper<LifeCoupon>()
-                    .eq("id", lifeUserOrderDto.getCouponId()).ge("single_qty",lifeUserOrderDto.getCount()).setSql("single_qty = single_qty - " + lifeUserOrderDto.getCount()));
+                    .eq("id", lifeUserOrderDto.getCouponId()).ge("single_qty", lifeUserOrderDto.getCount()).setSql("single_qty = single_qty - " + lifeUserOrderDto.getCount()));
         }
-        if(successful == 0){
+        if (successful == 0) {
             log.error("库存不足");
             throw new BusinessException("库存不足");
         }
@@ -806,32 +803,32 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
     public boolean updateUserOrder(LifeUserOrderDto lifeUserOrderDto) {
         Date date = new Date();
         LifeUserOrder lifeUserOrder = lifeUserOrderMapper.selectById(lifeUserOrderDto.getId());
-        if ( null == lifeUserOrder){
+        if (null == lifeUserOrder) {
             log.error("updateUserOrder未查询到订单");
             return false;
         }
         UpdateWrapper<OrderCouponMiddle> orderCouponMiddleUpdateWrapper = new UpdateWrapper<>();
-        orderCouponMiddleUpdateWrapper.eq("order_id",lifeUserOrderDto.getId());
+        orderCouponMiddleUpdateWrapper.eq("order_id", lifeUserOrderDto.getId());
         // 根据状态判断怎么更新数据 目前只进行已支付，已取消，已过期判断
-        switch (lifeUserOrderDto.getStatus()){
+        switch (lifeUserOrderDto.getStatus()) {
             case 1:
                 lifeUserOrder.setPayTime(date);
                 lifeUserOrder.setPayMethod(lifeUserOrderDto.getPayMethod());
                 lifeUserOrder.setStatus(lifeUserOrderDto.getStatus());
                 lifeUserOrder.setOrderNo(lifeUserOrderDto.getOrderNo());
-                orderCouponMiddleUpdateWrapper.set("status",lifeUserOrderDto.getStatus());
+                orderCouponMiddleUpdateWrapper.set("status", lifeUserOrderDto.getStatus());
                 break;
             case 3:
             case 4:
                 lifeUserOrder.setStatus(lifeUserOrderDto.getStatus());
                 lifeUserOrder.setCancelTime(date);
                 lifeUserOrder.setFinishTime(date);
-                orderCouponMiddleUpdateWrapper.set("status",lifeUserOrderDto.getStatus());
+                orderCouponMiddleUpdateWrapper.set("status", lifeUserOrderDto.getStatus());
                 break;
         }
         // 查询券id->查询一个
         int updateNum = orderCouponMiddleMapper.update(null, orderCouponMiddleUpdateWrapper);
-        if(1 != lifeUserOrderDto.getStatus()) {
+        if (1 != lifeUserOrderDto.getStatus()) {
             List<OrderCouponMiddle> orderCouponMiddles = orderCouponMiddleMapper.selectList(new QueryWrapper<OrderCouponMiddle>().eq("order_id", lifeUserOrderDto.getId()));
             if (0 != updateNum && orderCouponMiddles.size() > 0) {
                 Integer couponId = orderCouponMiddles.get(0).getCouponId();
@@ -848,12 +845,13 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
 
     /**
      * 删除用户订单,删除需要判断订单状态并且删除中间关系
+     *
      * @param orderId 订单id
      */
     @Transactional
     public boolean deleteUserOrder(String orderId) {
         LifeUserOrder lifeUserOrder = lifeUserOrderMapper.selectById(orderId);
-        if ( null == lifeUserOrder){
+        if (null == lifeUserOrder) {
             log.error("deleteUserOrder未查询到订单");
             return false;
         }
@@ -865,32 +863,33 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         }
         // 删除中间关系
         UpdateWrapper<OrderCouponMiddle> orderCouponMiddleUpdateWrapper = new UpdateWrapper<>();
-        orderCouponMiddleUpdateWrapper.eq("order_id",orderId);
+        orderCouponMiddleUpdateWrapper.eq("order_id", orderId);
         return this.removeById(orderId) && orderCouponMiddleService.remove(orderCouponMiddleUpdateWrapper);
     }
 
     /**
      * 查询用户订单列表
-     * @param page 页码
-     * @param size 每页数量
-     * @param userId 用户id
+     *
+     * @param page       页码
+     * @param size       每页数量
+     * @param userId     用户id
      * @param couponType 订单类型
-     * @param name 店铺名称
+     * @param name       店铺名称
      */
-    public IPage<LifeUserOrderVo> queryUserOrderList(Integer page, Integer size, String userId, String storeId, String couponType,String orderStatus, String name, String startTime, String endTime) {
+    public IPage<LifeUserOrderVo> queryUserOrderList(Integer page, Integer size, String userId, String storeId, String couponType, String orderStatus, String name, String startTime, String endTime) {
         IPage<LifeUserOrderVo> brandedPage = new Page<>(page, size);
         QueryWrapper<LifeUserOrderVo> lifeUserOrderQueryWrapper = new QueryWrapper<>();
-        lifeUserOrderQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(userId),"luo.user_id",userId);
-        lifeUserOrderQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(storeId),"luo.store_id",storeId);
-        lifeUserOrderQueryWrapper.eq(null != couponType && !"-1".equals(couponType),"luo.coupon_type",couponType);
+        lifeUserOrderQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(userId), "luo.user_id", userId);
+        lifeUserOrderQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(storeId), "luo.store_id", storeId);
+        lifeUserOrderQueryWrapper.eq(null != couponType && !"-1".equals(couponType), "luo.coupon_type", couponType);
 
         // 提取SQL基础部分，避免重复定义
         String baseSql = "select DISTINCT ocm1.order_id from order_coupon_middle ocm1 where 1=1";
         // TODO 应该可以直接判断总表
         if (!"-1".equals(orderStatus)) {
             // 非-1状态：直接添加状态条件
-                String sql = baseSql + " and ocm1.status = " + orderStatus;
-            if("2".equals(orderStatus)){
+            String sql = baseSql + " and ocm1.status = " + orderStatus;
+            if ("2".equals(orderStatus)) {
                 // 已完成进行特殊处理,
                 sql = sql + " and ocm1.order_id not in (\n" +
                         "\tselect\n" +
@@ -906,34 +905,34 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
             // -1状态且storeId不为空时添加条件
             if (org.apache.commons.lang3.StringUtils.isNotBlank(storeId)) {
                 // 注意：原代码中的concat不会修改原字符串，需要重新赋值
-                String sql = baseSql + " and ocm1.status not in  ("+OrderStatusEnum.WAIT_PAY.getStatus()
-                        +","+OrderStatusEnum.EXPIRE.getStatus()
-                        +","+OrderStatusEnum.CANCEL.getStatus()
-                        +")";
+                String sql = baseSql + " and ocm1.status not in  (" + OrderStatusEnum.WAIT_PAY.getStatus()
+                        + "," + OrderStatusEnum.EXPIRE.getStatus()
+                        + "," + OrderStatusEnum.CANCEL.getStatus()
+                        + ")";
                 lifeUserOrderQueryWrapper.inSql("luo.id", sql);
             }
         }
-        lifeUserOrderQueryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(name),"tc.coupon_name",name);
-        lifeUserOrderQueryWrapper.gt(org.apache.commons.lang3.StringUtils.isNotBlank(startTime),"luo.created_time",startTime + " 00:00:00");
-        lifeUserOrderQueryWrapper.lt(org.apache.commons.lang3.StringUtils.isNotBlank(endTime),"luo.created_time",endTime + " 23:59:59");
-        lifeUserOrderQueryWrapper.eq("luo.delete_flag",0);
+        lifeUserOrderQueryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(name), "tc.coupon_name", name);
+        lifeUserOrderQueryWrapper.gt(org.apache.commons.lang3.StringUtils.isNotBlank(startTime), "luo.created_time", startTime + " 00:00:00");
+        lifeUserOrderQueryWrapper.lt(org.apache.commons.lang3.StringUtils.isNotBlank(endTime), "luo.created_time", endTime + " 23:59:59");
+        lifeUserOrderQueryWrapper.eq("luo.delete_flag", 0);
         lifeUserOrderQueryWrapper.orderByDesc("luo.created_time");
-        lifeUserOrderQueryWrapper.groupBy("luo.coupon_type","luo.id");
+        lifeUserOrderQueryWrapper.groupBy("luo.coupon_type", "luo.id");
         IPage<LifeUserOrderVo> lifeUserOrderVoIPage = lifeUserOrderMapper.queryUserOrderList(brandedPage, lifeUserOrderQueryWrapper);
         if (!"-1".equals(orderStatus)) {
-            lifeUserOrderVoIPage.getRecords().forEach(x->x.setStatus(Integer.parseInt(orderStatus)));
+            lifeUserOrderVoIPage.getRecords().forEach(x -> x.setStatus(Integer.parseInt(orderStatus)));
         }
         // 计算退款金额
         for (LifeUserOrderVo record : lifeUserOrderVoIPage.getRecords()) {
-            record.setOrderCouponMiddleList(orderCouponMiddleMapper.selectList(new QueryWrapper<OrderCouponMiddle>().eq("order_id",record.getId())));
+            record.setOrderCouponMiddleList(orderCouponMiddleMapper.selectList(new QueryWrapper<OrderCouponMiddle>().eq("order_id", record.getId())));
             calcExpectIncome(record);
             // 如果代金券为平台优惠券并且是商户查询,则需要计算代金券金额
-            if("3".equals(record.getType()) && org.apache.commons.lang3.StringUtils.isNotBlank(record.getStoreId())){
+            if ("3".equals(record.getType()) && org.apache.commons.lang3.StringUtils.isNotBlank(record.getStoreId())) {
                 // 如果付款为0，商家收入为套餐原价
-                if(record.getFinalPrice().equals("0")){
+                if (record.getFinalPrice().equals("0")) {
                     // 如果付款为0，商家收入为套餐原价*数量
                     record.setFinalPrice(new BigDecimal(record.getPrice()).multiply(new BigDecimal(record.getCouponCount().toString())).toString());
-                }else {
+                } else {
                     record.setFinalPrice(record.getNominalValue().add(new BigDecimal(record.getFinalPrice())).toString());
                 }
             }
@@ -943,12 +942,13 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
 
     /**
      * 查询用户订单详情
+     *
      * @param orderId
      * @return
      */
-    public R<LifeUserOrderVo> queryUserOrderDetail(String orderId,String longitude, String latitude) {
-        LifeUserOrderVo lifeUserOrderVo = lifeUserOrderMapper.queryUserOrderDetail(orderId,org.apache.commons.lang3.StringUtils.isNotBlank(longitude) && org.apache.commons.lang3.StringUtils.isNotBlank(latitude)?longitude+","+latitude:"");
-        if ( null == lifeUserOrderVo){
+    public R<LifeUserOrderVo> queryUserOrderDetail(String orderId, String longitude, String latitude) {
+        LifeUserOrderVo lifeUserOrderVo = lifeUserOrderMapper.queryUserOrderDetail(orderId, org.apache.commons.lang3.StringUtils.isNotBlank(longitude) && org.apache.commons.lang3.StringUtils.isNotBlank(latitude) ? longitude + "," + latitude : "");
+        if (null == lifeUserOrderVo) {
             log.error("queryUserOrderDetail未查询到订单");
             return R.fail("未查询到订单");
         }
@@ -964,14 +964,14 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         // 预计收入
         // 退款金额
         BigDecimal refundAmount = new BigDecimal(0);
-        if(!CollectionUtils.isEmpty(refundList)){
+        if (!CollectionUtils.isEmpty(refundList)) {
             refundAmount = refundList.stream().map(OrderCouponMiddle::getPrice).reduce(BigDecimal.ZERO, BigDecimal::add);
         }
         // 预计收入
         BigDecimal expectIncome = BigDecimal.ZERO;
         // 如果使用了平台优惠券则预计收入特殊处理
-        if("3".equals(lifeUserOrderVo.getType())){
-            if(lifeUserOrderVo.getFinalPrice().equals("0")){
+        if ("3".equals(lifeUserOrderVo.getType())) {
+            if (lifeUserOrderVo.getFinalPrice().equals("0")) {
                 // 如果付款为0，商家收入为套餐原价*数量
                 expectIncome = new BigDecimal(lifeUserOrderVo.getPrice()).multiply(new BigDecimal(orderCouponMiddleList.size()));
             } else {
@@ -1004,33 +1004,34 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
 
     /**
      * 平台端-查询订单列表
-     * @param page 页码
-     * @param size 每页数量
-     * @param orderNo 订单号
-     * @param orderStatus 订单状态
-     * @param couponName 优惠券名称
-     * @param couponType 优惠券类型
-     * @param storeName 店铺名称
-     * @param buyStartTime 购买时间开始
-     * @param buyEndTime 购买时间结束
-     * @param payStartTime 支付时间开始
-     * @param payEndTime 支付时间结束
+     *
+     * @param page            页码
+     * @param size            每页数量
+     * @param orderNo         订单号
+     * @param orderStatus     订单状态
+     * @param couponName      优惠券名称
+     * @param couponType      优惠券类型
+     * @param storeName       店铺名称
+     * @param buyStartTime    购买时间开始
+     * @param buyEndTime      购买时间结束
+     * @param payStartTime    支付时间开始
+     * @param payEndTime      支付时间结束
      * @param finishStartTime 完成时间开始
-     * @param finishEndTime 完成时间结束
+     * @param finishEndTime   完成时间结束
      */
     public IPage<LifeUserOrderVo> queryOrderList(Integer page, Integer size, String orderNo, String orderStatus, String couponName, String couponType, String storeName, String buyStartTime, String buyEndTime, String payStartTime, String payEndTime, String finishStartTime, String finishEndTime) {
         IPage<LifeUserOrderVo> brandedPage = new Page<>(page, size);
         QueryWrapper<LifeUserOrderVo> lifeUserOrderQueryWrapper = new QueryWrapper<>();
-        lifeUserOrderQueryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(orderNo),"luo.order_no",orderNo);
-        lifeUserOrderQueryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(couponName),"tc.coupon_name",couponName);
-        lifeUserOrderQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(couponType),"tc.coupon_type",couponType);
-        lifeUserOrderQueryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(storeName),"si.store_name",storeName);
-        lifeUserOrderQueryWrapper.gt(org.apache.commons.lang3.StringUtils.isNotBlank(buyStartTime),"luo.buy_time",buyStartTime + " 00:00:00");
-        lifeUserOrderQueryWrapper.lt(org.apache.commons.lang3.StringUtils.isNotBlank(buyEndTime),"luo.buy_time",buyEndTime + " 23:59:59");
-        lifeUserOrderQueryWrapper.gt(org.apache.commons.lang3.StringUtils.isNotBlank(payStartTime),"luo.pay_time",payStartTime + " 00:00:00");
-        lifeUserOrderQueryWrapper.lt(org.apache.commons.lang3.StringUtils.isNotBlank(payEndTime),"luo.pay_time",payEndTime + " 23:59:59");
-        lifeUserOrderQueryWrapper.gt(org.apache.commons.lang3.StringUtils.isNotBlank(finishStartTime),"luo.finish_time",finishStartTime + " 00:00:00");
-        lifeUserOrderQueryWrapper.lt(org.apache.commons.lang3.StringUtils.isNotBlank(finishEndTime),"luo.finish_time",finishEndTime + " 23:59:59");
+        lifeUserOrderQueryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(orderNo), "luo.order_no", orderNo);
+        lifeUserOrderQueryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(couponName), "tc.coupon_name", couponName);
+        lifeUserOrderQueryWrapper.eq(org.apache.commons.lang3.StringUtils.isNotBlank(couponType), "tc.coupon_type", couponType);
+        lifeUserOrderQueryWrapper.like(org.apache.commons.lang3.StringUtils.isNotBlank(storeName), "si.store_name", storeName);
+        lifeUserOrderQueryWrapper.gt(org.apache.commons.lang3.StringUtils.isNotBlank(buyStartTime), "luo.buy_time", buyStartTime + " 00:00:00");
+        lifeUserOrderQueryWrapper.lt(org.apache.commons.lang3.StringUtils.isNotBlank(buyEndTime), "luo.buy_time", buyEndTime + " 23:59:59");
+        lifeUserOrderQueryWrapper.gt(org.apache.commons.lang3.StringUtils.isNotBlank(payStartTime), "luo.pay_time", payStartTime + " 00:00:00");
+        lifeUserOrderQueryWrapper.lt(org.apache.commons.lang3.StringUtils.isNotBlank(payEndTime), "luo.pay_time", payEndTime + " 23:59:59");
+        lifeUserOrderQueryWrapper.gt(org.apache.commons.lang3.StringUtils.isNotBlank(finishStartTime), "luo.finish_time", finishStartTime + " 00:00:00");
+        lifeUserOrderQueryWrapper.lt(org.apache.commons.lang3.StringUtils.isNotBlank(finishEndTime), "luo.finish_time", finishEndTime + " 23:59:59");
 //            @ApiImplicitParam(name = "orderStatus", value = "订单状态,-1，全部（可以不传）；0，待支付;1，已支付/待使用;2，已核销；3，已过期;4，已取消;5.已退款，全退款了才算", required = false),
         // 提取SQL基础部分，避免重复定义
 //        String baseSql = "select DISTINCT ocm1.order_id from order_coupon_middle ocm1 where 1=1";
@@ -1039,25 +1040,26 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
             // 非-1状态：直接添加状态条件
 //            String sql = baseSql + " and ocm1.status = " + orderStatus;
 //            lifeUserOrderQueryWrapper.inSql("luo.id", sql);
-            lifeUserOrderQueryWrapper.eq("ocm.status",orderStatus);
+            lifeUserOrderQueryWrapper.eq("ocm.status", orderStatus);
         }
         lifeUserOrderQueryWrapper.groupBy("luo.id");
         IPage<LifeUserOrderVo> lifeUserOrderVoIPage = lifeUserOrderMapper.queryUserOrderList(brandedPage, lifeUserOrderQueryWrapper);
 
         if (!"-1".equals(orderStatus)) {
-            lifeUserOrderVoIPage.getRecords().forEach(x->x.setStatus(Integer.parseInt(orderStatus)));
+            lifeUserOrderVoIPage.getRecords().forEach(x -> x.setStatus(Integer.parseInt(orderStatus)));
         }
         return lifeUserOrderVoIPage;
     }
 
     /**
      * 平台端-查询订单详情
+     *
      * @param orderId
      * @return
      */
     public R queryOrderDetail(String orderId) {
-        LifeUserOrderVo lifeUserOrderVo = lifeUserOrderMapper.queryUserOrderDetail(orderId,null);
-        if ( null == lifeUserOrderVo){
+        LifeUserOrderVo lifeUserOrderVo = lifeUserOrderMapper.queryUserOrderDetail(orderId, null);
+        if (null == lifeUserOrderVo) {
             log.error("queryUserOrderDetail未查询到订单");
             return R.fail("未查询到订单");
         }
@@ -1066,15 +1068,17 @@ public class LifeUserOrderService extends ServiceImpl<LifeUserOrderMapper, LifeU
         lifeUserOrderVo.setCouponCount(lifeUserOrderVo.getOrderCouponMiddleList().size());
         return R.data(lifeUserOrderVo);
     }
+
     /**
      * 团购/代金券-校验用户是否可以购买
-     * @param couponId 团购/代金券id
+     *
+     * @param couponId   团购/代金券id
      * @param couponType 团购/代金券类型
-     * @param userId 用户id
-     * @param count 购买数量
+     * @param userId     用户id
+     * @param count      购买数量
      * @return
      */
-    public Map<String, Object> buyCouponCheck(String couponId, Integer couponType, String userId,String storeId, Integer count) {
+    public Map<String, Object> buyCouponCheck(String couponId, Integer couponType, String userId, String storeId, Integer count) {
         Map<String, Object> returnMap = new HashMap<>();
         // 获取团购/代金券信息
         Integer status = 0;