Merge remote-tracking branch 'origin/feature-1.1-bnyer-order' into feature-1.1-dev

bnyer-common/bnyer-common-core/src/main/java/com/bnyer/common/core/enums/ResponseEnum.java

@@ -24,13 +24,13 @@ public enum ResponseEnum {
     ORDER_CANCEL(110004, "该订单已取消，请重新下单！"),
     ORDER_REPEAT_PAY(110005, "该订单已支付，请勿重复支付！"),
     REFUND_SING_ERROR(110006, "签名错误！"),
+    REFUND_FAILS(110008, "退款失败！"),
 
 
 
     //======================第三方接口调用异常========================
     PAY_FAILS(220001,"支付失败,请稍后重试"),
     ORDER_QUERY_FAILS(220002,"订单查询失败,请稍后重试"),
-    REFUND_FAILS(220003,"退款失败,请稍后重试"),
 
     ;
 

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/design/strategy/DYPayStrategy.java

@@ -16,6 +16,7 @@ import com.bnyer.pay.bean.bo.UnifiedOrderBo;
 import com.bnyer.pay.constant.DYPayConstants;
 import com.bnyer.pay.bean.dto.EditPayInfoNotifyDto;
 import com.bnyer.pay.bean.dto.PayNotifyCheckDto;
+import com.bnyer.pay.enums.EnumDyPayStatus;
 import com.bnyer.pay.enums.EnumPayChannel;
 import com.bnyer.pay.enums.EnumPayConfigStatus;
 import com.bnyer.pay.mapper.DypayConfigMapper;
@@ -213,7 +214,7 @@ public class DYPayStrategy extends AbstractPayStrategy{
         //抖音侧订单号
         String dyOrderId = msgJsonObj.getString("order_id");
         //这里无论回调失败还是成功,都需要都各个业务层去处理相关逻辑
-        if(!"success".equals(status)){
+        if(EnumDyPayStatus.SUCCESS.getStatus().equals(status)){
             log.info("抖音支付回调不是支付成功不做处理:支付状态:{},payId:{}",status,outOrderNo);
             return super.buildNotifyCheckResultMsg(EnumPayType.DY_PAY,false,"trade fail");
         }

bnyer-services/bnyer-pay/src/main/java/com/bnyer/pay/service/impl/UnifiedPayServiceImpl.java

@@ -290,10 +290,11 @@ public class UnifiedPayServiceImpl implements UnifiedPayService {
         refundOrder.setThirdCode(thirdRefundVo.getThirdCode());
         refundOrder.setThirdMsg(thirdRefundVo.getThirdMsg());
         refundOrder.setThirdNo(thirdRefundVo.getThirdNo());
-        refundOrder.setRefundStatus(ObjectUtil.equal(thirdRefundVo.getThirdCode(),"0")?1002:1000);
+        refundOrder.setRefundStatus(ObjectUtil.equal(thirdRefundVo.getThirdCode(),"0")?EnumRefundStatus.SUCCESS.getStatus():
+                EnumRefundStatus.NO_REFUND.getStatus());
         payInfoMapper.insert(refundOrder);
         if (!"0".equals(thirdRefundVo.getThirdCode())){
-            throw new ServiceException(thirdRefundVo.getThirdMsg());
+            throw new ServiceException(thirdRefundVo.getThirdMsg(),ResponseEnum.REFUND_FAILS.getCode());
         }
     }