修改判断逻辑

Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>

order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java

@@ -1361,7 +1361,6 @@ public class OrderAdapter {
 
     public OrderViewStatusDto getOrderViewStatusDesc(OrderBeanV1 orderBean, String wxAppId) {
         OrderViewStatusDto orderViewStatusDto = new OrderViewStatusDto();
-        AppLogUtil.infoLog("getOrderStatusDesc start ", JSON.toJSONString(orderBean), "");
         RefundBeanV1 refundBean = null;
         if (CollectionUtils.isNotEmpty(orderBean.getRefundList())) {
             refundBean = orderBean.getRefundList().get(0);
@@ -1764,7 +1763,13 @@ public class OrderAdapter {
            return this.checkAdvanceOrder(orderBean.getGmtExpect());
         }
 
-        // 加价购选择虚拟商品券包，订单完成前可申请退款，完成之后不能申请退款
+        // fisherman 虚拟券商品是否可退款配置校验
+        if (orderBean.getBizType().compareTo(BizTypeEnum.SALE_COUPON.getBizType()) == 0) {
+            return this.checkRefundButtionBizTypeIs6(orderBean.getCompanyId(), orderBean.getBizType(),
+                    orderBean.getStatus(),wxAppId, new Date(orderBean.getGmtCreate()), orderBean.getOrderType());
+        }
+
+        // 加价购选择虚拟商品券包，订单完成前可申请退款，完成之后不能申请退款 --> 这里的 bizType应该是 = 1的
         if (OrderStatus.COMPLETE.equals(status) && CollectionUtils.isNotEmpty(orderBean.getProductList())) {
             for (ProductBeanV1 productBeanV1 : orderBean.getProductList()){
                 if(StringUtils.isNotEmpty(productBeanV1.getExtInfo())){
@@ -1775,11 +1780,6 @@ public class OrderAdapter {
                 }
             }
         }
-        // fisherman 虚拟券商品是否可退款配置校验
-        if (orderBean.getBizType().compareTo(BizTypeEnum.SALE_COUPON.getBizType()) == 0) {
-            return this.checkRefundButtionBizTypeIs6(orderBean.getCompanyId(), orderBean.getBizType(),
-                    orderBean.getStatus(),wxAppId, new Date(orderBean.getGmtCreate()), orderBean.getOrderType());
-        }
 
         boolean canRefund = false;
         // 查询小程序配置的退款设置