Merge branch '小助手门店操作退款-oms-基于pre分支' into qa

order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java

@@ -3742,7 +3742,7 @@ public class OrderServiceImpl implements Orderservice {
             request.setStoreId(orderBean.getShopId());
             request.setOrderId(orderBean.getOid());
             request.setReason(orderRefundVo.getReason());
-            request.setOperateType(cn.freemud.management.enums.OperateType.ORDER_DEVELOPER_AGREE_REFUND.getOpType());
+            request.setOperateType(cn.freemud.management.enums.OperateType.ORDER_RETRY_AGREE_REFUND.getOpType());
             request.setOperator(orderRefundVo.getOperator());
             BaseResponse baseResponse = orderManagerAdapter.orderRetryAgreeRefund(request);
             return baseResponse;

shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java

@@ -359,7 +359,7 @@ public class CouponServiceImpl implements CouponService {
                 if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_1.getCode())) {
                     activityCouponBean.setDiscountAmount(couponStateVo.getOriginalPrice() + "");
                 } else if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_3.getCode())) {
-                    // TODO 折扣券 百分值10 乘以10   前端统一除以100作为操作依据
+                    // TODO 折扣券 百分值10 乘以10   前端统一除以100作为操作依据 _> 废弃, 现在默认 不乘10
                     activityCouponBean.setDiscountAmount(couponStateVo.getDiscount() != null ? couponStateVo.getDiscount() * 10 + "" : "0");
                 }else if (Objects.equals(couponStateVo.getType(), CouponTypeEnum.TYPE_5.getCode())) {
                     // 这里需要加入 配送券逻辑  如果为null 表示 配送券金额 全免, 否则就是部分减免