feat: 1.美团核销券相关接口 2.退款支持优惠券积分退款，金额比例退

eladmin-system/src/main/java/cn/ysk/cashier/controller/ThirdPartyCouponController.java

@@ -0,0 +1,31 @@
+package cn.ysk.cashier.controller;
+
+import cn.ysk.cashier.service.ThirdPartyCouponService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestHeader;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 三方团购券
+ */
+@RestController
+@RequestMapping("/api/thirdPartyCoupon")
+public class ThirdPartyCouponController {
+
+    private final ThirdPartyCouponService thirdPartyCouponService;
+
+    public ThirdPartyCouponController(ThirdPartyCouponService thirdPartyCouponService) {
+        this.thirdPartyCouponService = thirdPartyCouponService;
+    }
+
+    /**
+     * 获取美团绑定链接
+     * @return 美团绑定链接
+     */
+    @GetMapping
+    public ResponseEntity<String> getBindUrl() {
+        return ResponseEntity.ok(thirdPartyCouponService.getBindUrl());
+    }
+}

eladmin-system/src/main/java/cn/ysk/cashier/dto/shoptable/UpdateCartDTO.java

@@ -22,5 +22,7 @@ public class UpdateCartDTO {
     private String note;
     private Boolean isPack;
     private Boolean isGift;
+    // 是否打印
+    private Boolean isPrint;
 
 }

eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java

@@ -15,6 +15,7 @@
  */
 package cn.ysk.cashier.pojo.order;
 
+import cn.ysk.cashier.mybatis.entity.TbActivateOutRecord;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
 import io.swagger.annotations.ApiModelProperty;
@@ -173,6 +174,8 @@ public class TbCashierCart implements Serializable {
     private String unit;
     private BigDecimal discountSaleAmount;
     private String discountSaleNote;
+    private Boolean isPrint;
+    private String useCouponInfo;
 
     public void copy(TbCashierCart source) {
         BeanUtil.copyProperties(source, this, CopyOptions.create().setIgnoreNullValue(true));
@@ -211,4 +214,5 @@ public class TbCashierCart implements Serializable {
         }
     }
 
+
 }

eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java

@@ -15,6 +15,7 @@
 */
 package cn.ysk.cashier.pojo.order;
 
+import cn.ysk.cashier.mybatis.entity.TbActivateOutRecord;
 import com.baomidou.mybatisplus.annotation.TableField;
 import lombok.Data;
 import cn.hutool.core.bean.BeanUtil;
@@ -133,9 +134,11 @@ public class TbOrderDetail implements Serializable {
     private Integer isMember;
     private Integer isTemporary;
     private String discountSaleNote;
-
+    private Boolean isPrint;
+    private String useCouponInfo;
 
     public void copy(TbOrderDetail source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
+
 }

eladmin-system/src/main/java/cn/ysk/cashier/resp/PhpCommonResp.java

@@ -0,0 +1,11 @@
+package cn.ysk.cashier.resp;
+
+import lombok.Data;
+
+@Data
+public class PhpCommonResp<T> {
+    private String code;
+    private String msg;
+    private long time;
+    private T data;
+}

eladmin-system/src/main/java/cn/ysk/cashier/service/ThirdPartyCouponService.java

@@ -0,0 +1,9 @@
+package cn.ysk.cashier.service;
+
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+public interface ThirdPartyCouponService {
+
+    String getBindUrl();
+}

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/ThirdPartyCouponServiceImpl.java

@@ -0,0 +1,38 @@
+package cn.ysk.cashier.service.impl;
+
+import cn.ysk.cashier.exception.BadRequestException;
+import cn.ysk.cashier.resp.PhpCommonResp;
+import cn.ysk.cashier.service.ThirdPartyCouponService;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
+
+@Service
+public class ThirdPartyCouponServiceImpl implements ThirdPartyCouponService {
+
+    @Value("${phpServer}")
+    private String phpServerUrl;
+
+    public ThirdPartyCouponServiceImpl(RestTemplate restTemplate) {
+        this.restTemplate = restTemplate;
+    }
+    private final RestTemplate restTemplate;
+
+    private <T> T getData(String url, Object data) {
+        PhpCommonResp<?> resp = restTemplate.getForEntity(phpServerUrl + url, PhpCommonResp.class).getBody();
+        if (resp == null) {
+            throw new BadRequestException("请求php服务器失败");
+        }
+
+        if (!"1".equals(resp.getCode())) {
+            throw new BadRequestException(resp.getMsg());
+        }
+
+        return (T) resp.getData();
+    }
+
+    @Override
+    public String getBindUrl() {
+        return getData("/meituan/getuisdkurl", null);
+    }
+}

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java

@@ -2,6 +2,7 @@
 package cn.ysk.cashier.service.impl.shopimpl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.convert.Convert;
 import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.thread.ThreadUtil;
@@ -454,6 +455,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         tbCashierCart.setSalePrice(tbCashierCart.getSalePrice());
         tbCashierCart.setTotalAmount(updateCartDTO.getNum().multiply(tbCashierCart.getSalePrice()));
         tbCashierCart.setNote(updateCartDTO.getNote());
+        tbCashierCart.setIsPrint(updateCartDTO.getIsPrint());
 
         if (updateCartDTO.getIsPack() != null) {
             if (!updateCartDTO.getIsPack()) {
@@ -1308,13 +1310,12 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
                 // 创建结余购物车
                 balanceCart = BeanUtil.copyProperties(cashierCart, TbCashierCart.class);
-                BigDecimal num = balanceNum;
                 balanceCart.setUserCouponId(null);
                 balanceCart.setId(null);
                 balanceCart.setNumber(balanceNum);
                 balanceCart.setTotalNumber(balanceNum);
-                balanceCart.setPackFee(singlePackFee.multiply(num));
+                balanceCart.setPackFee(singlePackFee.multiply(balanceNum));
-                balanceCart.setTotalAmount(cashierCart.getTotalAmountByNum(balanceNum).add(singlePackFee.multiply(num)));
+                balanceCart.setTotalAmount(cashierCart.getTotalAmountByNum(balanceNum).add(singlePackFee.multiply(balanceNum)));
                 balanceCartList.add(balanceCart);
             } else {
                 currentUseNum =cashierCart.getNumber();
@@ -1334,6 +1335,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             tbActivateOutRecord.setCreateTime(DateUtil.date());
             tbActivateOutRecord.setRefNum(0);
             outRecords.add(tbActivateOutRecord);
+            cashierCart.setUseCouponInfo(JSONObject.toJSONString(tbActivateOutRecord));
 
             couponVo.setFinalDiscountAmount(discountAmount);
             // 优惠券未消耗完毕
@@ -1526,6 +1528,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
     }
 
+
     /**
      * 根据商品优惠券
      *
@@ -1609,6 +1612,9 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             orderDetail.setIsTemporary(cashierCart.getIsTemporary());
             orderDetail.setOrderId(orderInfo == null ? null : orderInfo.getId());
             orderDetail.setIsMember(cashierCart.getIsMember());
+            orderDetail.setIsPrint(cashierCart.getIsPrint());
+            orderDetail.setUseCouponInfo(cashierCart.getUseCouponInfo());
+
             priceDTO.getOrderDetailList().add(orderDetail);
         }
         return priceDTO;
@@ -2138,6 +2144,34 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         return orderInfo.getOrderAmount();
     }
 
+    /**
+     * 根据折扣设置订单信息
+     */
+    private BigDecimal resetAmountByDiscount(PayDTO payDTO, TbOrderInfo orderInfo) {
+        List<TbCashierCart> cashierCarts = mpCashierCartService.selectByOrderIdAndState(orderInfo.getId());
+        List<TbOrderDetail> detailList = mpOrderDetailService.selectByOrderId(orderInfo.getId());
+        BigDecimal discount = BigDecimal.valueOf(payDTO.getDiscount());
+        cashierCarts.forEach(item -> {
+            item.setTotalAmount(item.getTotalAmount().multiply(discount).setScale(2, RoundingMode.HALF_UP));
+        });
+
+        detailList.forEach(item -> {
+            item.setPriceAmount(item.getPriceAmount().multiply(discount).setScale(2, RoundingMode.HALF_UP));
+        });
+
+        mpCashierCartService.updateBatchById(cashierCarts);
+        mpOrderDetailService.updateBatchById(detailList);
+        BigDecimal oldAmount = orderInfo.getOrderAmount();
+        BigDecimal finalAmount = orderInfo.getOrderAmount().multiply(BigDecimal.valueOf(payDTO.getDiscount())).setScale(2, RoundingMode.HALF_UP);
+        BigDecimal discountAmount = oldAmount.subtract(finalAmount);
+        orderInfo.setDiscountAmount(discountAmount);
+        orderInfo.setOrderAmount(finalAmount);
+        orderInfo.setAmount(finalAmount);
+        orderInfo.setSettlementAmount(finalAmount);
+        mpOrderInfoService.updateById(orderInfo);
+        return finalAmount;
+    }
+
     @Override
 //    @Transactional
     public Object pay(PayDTO payDTO) {
@@ -2157,8 +2191,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 payDTO.setVipUserId(orderInfo.getMemberId() != null ? Integer.valueOf(orderInfo.getMemberId()) : null);
             }
 
-
-
             if (ObjectUtil.isEmpty(orderInfo)) {
                 throw new BadRequestException("订单不存在");
             }
@@ -2172,17 +2204,20 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 payDTO.setDiscount((double) 1);
             }
 
-            // 计算优惠券积分折扣信息
             BigDecimal finalAmount = null;
+            // 计算订单折扣信息
+            if (payDTO.getDiscount() != 1) {
+                finalAmount = resetAmountByDiscount(payDTO, orderInfo);
+            }else {
+                finalAmount = orderInfo.getOrderAmount();
+            }
+
+            // 计算优惠券积分折扣信息
             if (payDTO.getVipUserId() != null) {
                 // 计算商品券折扣
                 finalAmount = calcDiscountAndUpdateInfo(payDTO, orderInfo);
             }
 
-            if (finalAmount == null) {
-                finalAmount = orderInfo.getOrderAmount().multiply(BigDecimal.valueOf(payDTO.getDiscount())).setScale(2, RoundingMode.HALF_UP);
-            }
-
             boolean isOnline = false;
 
             switch (payDTO.getPayType()) {
@@ -2671,15 +2706,15 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             throw new BadRequestException("订单明细数量不一致");
         }
 
+        HashMap<String, Object> data = new HashMap<>();
         BigDecimal returnAmount = BigDecimal.ZERO;
         BigDecimal packAMount = BigDecimal.ZERO;
         BigDecimal saleAmount = BigDecimal.ZERO;
         ArrayList<TbOrderDetail> remainOrderDetailList = new ArrayList<>();
         for (TbOrderDetail orderDetail : detailList) {
-            if (orderDetail.getUserCouponId() != null) {
+            // 退款数量
-                throw new BadRequestException("选择了优惠券抵扣商品，无法退款");
-            }
             BigDecimal returnNum = returnNumMap.get(orderDetail.getId().toString());
+            // 剩余数量
             BigDecimal remainNum = orderDetail.getNum().subtract(returnNum);
             if (remainNum.compareTo(BigDecimal.ZERO) < 0) {
                 throw new BadRequestException("{}最多可退数量为: {}", orderDetail.getProductName(), orderDetail.getNum());
@@ -2700,14 +2735,6 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 remainOrderDetailList.add(remainOrderDetail);
             }
 
-            returnAmount = returnAmount.add(orderDetail.getPriceAmount()
-                    .divide(orderDetail.getNum(), 2, RoundingMode.DOWN)
-                    .multiply(returnNum));
-            saleAmount = saleAmount.add(orderDetail.getPrice());
-            packAMount = packAMount.add(orderDetail.getPackAmount()
-                    .divide(orderDetail.getNum(), 2, RoundingMode.DOWN)
-                    .multiply(returnNum));
-
             BigDecimal returnPackFee = packFee.multiply(returnNum);
             orderDetail.setNum(returnNum);
             orderDetail.setPriceAmount(returnNum.multiply(orderDetail.getPrice())
@@ -2716,6 +2743,34 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             orderDetail.setRefundNumber(returnNum);
 //            orderDetail.setStatus(isOnline ? "refunding" : "refund");
             orderDetail.setStatus("refund");
+            // 优惠券抵扣商品直接退券
+            if (StrUtil.isNotBlank(orderDetail.getUseCouponInfo())) {
+                data.put("isCouponDiscount", true);
+                TbActivateOutRecord outRecord = JSONObject.parseObject(orderDetail.getUseCouponInfo(), TbActivateOutRecord.class);
+                outRecord.setRefNum(returnNum.intValue());
+                shopCouponService.refund(CollUtil.newArrayList(outRecord));
+                // 使用了满减或积分，获取普通付款商品计算退款比例，退部分现金
+            }else if (oldOrderInfo.getFullCouponDiscountAmount().compareTo(BigDecimal.ZERO) > 0 || oldOrderInfo.getPointsDiscountAmount().compareTo(BigDecimal.ZERO) > 0){
+                // 计算当前商品占比
+                BigDecimal ratio = calcDetailRatio(orderDetail);
+                BigDecimal realAmount = orderDetail.getPriceAmount().multiply(ratio);
+                returnAmount = returnAmount.add(realAmount
+                        .divide(orderDetail.getNum(), 2, RoundingMode.DOWN)
+                        .multiply(returnNum));
+                saleAmount = saleAmount.add(orderDetail.getPrice());
+                packAMount = packAMount.add(orderDetail.getPackAmount()
+                        .divide(orderDetail.getNum(), 2, RoundingMode.DOWN)
+                        .multiply(returnNum));
+
+            }else {
+                returnAmount = returnAmount.add(orderDetail.getPriceAmount()
+                        .divide(orderDetail.getNum(), 2, RoundingMode.DOWN)
+                        .multiply(returnNum));
+                saleAmount = saleAmount.add(orderDetail.getPrice());
+                packAMount = packAMount.add(orderDetail.getPackAmount()
+                        .divide(orderDetail.getNum(), 2, RoundingMode.DOWN)
+                        .multiply(returnNum));
+            }
         }
 
         if (returnAmount.compareTo(BigDecimal.ZERO) <= 0) {
@@ -2757,12 +2812,23 @@ public class TbShopTableServiceImpl implements TbShopTableService {
 
         updateStockAndRecord(detailList);
         mpOrderDetailService.updateBatchById(detailList);
-        HashMap<String, Object> data = new HashMap<>();
         data.put("returnOrder", returnOrder);
         data.put("returnAmount", returnAmount);
         return data;
     }
 
+    private BigDecimal calcDetailRatio(TbOrderDetail orderDetail) {
+        List<TbOrderDetail> detailList = mpOrderDetailService.selectByOrderIdAndState(orderDetail.getId(), TableConstant.OrderInfo.Status.CLOSED);
+        BigDecimal totalAmount = BigDecimal.ZERO;
+        for (TbOrderDetail item : detailList) {
+            if (item.getUserCouponId() == null) {
+                totalAmount = totalAmount.add(item.getPriceAmount());
+            }
+        }
+
+        return orderDetail.getPriceAmount().divide(totalAmount, 2, RoundingMode.HALF_UP);
+    }
+
     private void updateStockAndRecord(List<TbOrderDetail> orderDetailList) {
         // 更新商品库存
         for (TbOrderDetail detail : orderDetailList) {
@@ -2826,7 +2892,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         String shopId = orderInfo.getShopId();
 
 //        // 线上退款
-        orderInfo.setRefundAmount(returnOrderInfo.getRefundAmount());
+        orderInfo.setRefundAmount(orderInfo.getRefundAmount().add(returnOrderInfo.getRefundAmount()));
         orderInfo.setRefundRemark(returnOrderDTO.getNote());
         if ("scanCode".equals(payType) || "wx_lite".equals(payType)) {
             payService.returnOrder(Integer.valueOf(shopId), orderInfo, returnOrderInfo);
@@ -2842,6 +2908,10 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                     returnOrderDTO.getOrderId(), returnOrderDTO.getOrderDetails().stream().map(ReturnOrderDTO.OrderDetail::getId).collect(Collectors.toList()));
         }
         orderInfo.setStatus(TableConstant.OrderInfo.Status.CLOSED.getValue());
+        // 订单金额全退，退优惠券以及积分
+        if (orderInfo.getPayAmount().compareTo(orderInfo.getRefundAmount()) <= 0) {
+            returnCoupon(orderInfo);
+        }
         orderInfoMapper.updateById(orderInfo);
         // 打印退款小票
 //        producer.printMechine(newOrderInfo.getId().toString());