Merge remote-tracking branch 'origin/dev' into dev

src/main/java/com/huiju/estateagents/entity/TaRaiseRecord.java

@@ -114,6 +114,11 @@ public class TaRaiseRecord implements Serializable {
      */
     private String refundReason;
 
+    /**
+     * 退费失败原因
+     */
+    private String refundFailReason;
+
     /**
      * 创建时间
      */

src/main/java/com/huiju/estateagents/service/impl/WxPayServiceImpl.java

@@ -214,12 +214,12 @@ public class WxPayServiceImpl implements IWxPayService {
                 if (orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
                     taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_REFUNDED);
                     if (!StringUtils.isEmpty(orderInfo.get("err_code"))){
-                        taRaiseRecord.setRefundReason(WXPayRefundReason.getMsg(orderInfo.get("err_code")));
+                        taRaiseRecord.setRefundFailReason(WXPayRefundReason.getMsg(orderInfo.get("err_code")));
                     }
                 }
                 if (!orderInfo.get("refund_status").equals(WXPayConstants.SUCCESS)){
                     taRaiseRecord.setPayStatus(CommConstant.PAY_STATUS_CHANGE);
-                    taRaiseRecord.setRefundReason("");
+                    taRaiseRecord.setRefundFailReason("");
                 }
 
                 taRaiseRecordMapper.updateById(taRaiseRecord);