提代码

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

@@ -15,6 +15,7 @@ import com.hfkj.entity.BsOrderRefundExample;
 import com.hfkj.mer.BsMerPayConfigService;
 import com.hfkj.model.order.OrderChildModel;
 import com.hfkj.model.order.OrderModel;
+import com.hfkj.service.hlt.HuiLianTongUnionCardService;
 import com.hfkj.service.order.BsOrderChildService;
 import com.hfkj.service.order.BsOrderRefundService;
 import com.hfkj.service.order.BsOrderService;
@@ -36,10 +37,7 @@ import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
-import java.util.Date;
+import java.util.*;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 /**
  * @className: BsOrderRefundServiceImpl
@@ -96,12 +94,25 @@ public class BsOrderRefundServiceImpl implements BsOrderRefundService {
                 }
 
             } else if (OrderPayChannelEnum.type3.getCode() == orderRefund.getRefundPayChannel()) {
-                    // 商户退款
+                // 商户退款
-                    JSONObject refundObj = huiftTradeService.thirdPayRefund(orderRefund.getRefundOrderNo(), orderRefund.getRefundPrice(), orderRefund.getOrderNo());
+                JSONObject refundObj = huiftTradeService.thirdPayRefund(orderRefund.getRefundOrderNo(), orderRefund.getRefundPrice(), orderRefund.getOrderNo());
-                    orderRefund.setRefundSerialNo(refundObj.getString("refundTraceNo"));
+                orderRefund.setRefundSerialNo(refundObj.getString("refundTraceNo"));
-                    orderRefund.setRefundPayChannelOrderNo(refundObj.getString("refundOrderNo"));
+                orderRefund.setRefundPayChannelOrderNo(refundObj.getString("refundOrderNo"));
-                    return true;
+                return true;
-            } else {
+
+            } /*else if (OrderPayChannelEnum.type4.getCode() == orderRefund.getRefundPayChannel()) {
+                // 商户退款
+                JSONObject refundObj = HuiLianTongUnionCardService.refund(orderRefund.getRefundOrderNo(), orderRefund.getOrderNo());
+                if (!refundObj.getString("respCode").equals("0000")) {
+                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, refundObj.getString("respMessage"));
+                }
+                JSONObject consumptionResult = HuiLianTongUnionCardService.resolveResponse(refundObj.getString("data"));
+                if (!(consumptionResult.getBoolean("success") || Objects.equals(consumptionResult.getString("message"), "原交易已撤销,不可再次操作"))) {
+                    throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "退款失败!"+consumptionResult.getString("message"));
+                }
+                orderRefund.setRefundSerialNo(consumptionResult.getString("orderId"));
+                return true;
+            }*/ else {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "退款失败！该支付方式暂不支持退款");
             }
         } catch (BaseException e) {
@@ -254,6 +265,10 @@ public class BsOrderRefundServiceImpl implements BsOrderRefundService {
         BsOrderRefundExample example = new BsOrderRefundExample();
         BsOrderRefundExample.Criteria criteria = example.createCriteria();
 
+        if (MapUtils.getLong(param, "merId") != null) {
+            criteria.andMerIdEqualTo(MapUtils.getLong(param, "merId"));
+        }
+
         if (StringUtils.isNotBlank(MapUtils.getString(param, "userPhone"))) {
             criteria.andUserPhoneEqualTo(MapUtils.getString(param, "userPhone"));
         }