订单退款

src/main/java/com/ctrip/fun/golf/service/payment/AbstractNotifyService.java

@@ -18,6 +18,7 @@ import com.ctrip.fun.common.vo.basic.VoucherSourceEnum;
 import com.ctrip.fun.common.vo.integral.IntegralLogTypeEnum;
 import com.ctrip.fun.common.vo.integral.IntegralLogTypeEnum;
 import com.ctrip.fun.common.vo.order.OrderCategoryEnum;
 import com.ctrip.fun.common.vo.order.OrderCategoryEnum;
 import com.ctrip.fun.common.vo.order.OrderProcessEnum;
 import com.ctrip.fun.common.vo.order.OrderProcessEnum;
+import com.ctrip.fun.common.vo.order.OrderSourceEnum;
 import com.ctrip.fun.common.vo.order.OrderStatusBitEnum;
 import com.ctrip.fun.common.vo.order.OrderStatusBitEnum;
 import com.ctrip.fun.common.vo.order.OrderStatusEnum;
 import com.ctrip.fun.common.vo.order.OrderStatusEnum;
 import com.ctrip.fun.common.vo.order.PrePayCardStatusEnum;
 import com.ctrip.fun.common.vo.order.PrePayCardStatusEnum;
@@ -192,6 +193,7 @@ public abstract class AbstractNotifyService extends CorePaymentService {
                       }
                       }
                       // 设置支付方式   防止APP 下单 小程序支付
                       // 设置支付方式   防止APP 下单 小程序支付
                       order.setPlatform("MP");
                       order.setPlatform("MP");
+                      order.setOrderSource(OrderSourceEnum.H5CTRIP.getKey());
                       //6、更新订单信息（状态）
                       //6、更新订单信息（状态）
                       this.orderDao.update(order);
                       this.orderDao.update(order);
                       this.doPaySuccess(order);
                       this.doPaySuccess(order);

src/main/java/com/ctrip/fun/golf/service/payment/AbstractPaymentService.java

@@ -188,6 +188,7 @@ public abstract class AbstractPaymentService<T extends AbstractOrder> extends Co
     			}else if(order.getOrderCategory()==14){
     			}else if(order.getOrderCategory()==14){
     				refoundNotifyUrl=weiXinRefoundNotifyUrl.replace("{orderType}", "eventActivityOrder");
     				refoundNotifyUrl=weiXinRefoundNotifyUrl.replace("{orderType}", "eventActivityOrder");
     			}
     			}
+    			BigDecimal xx= order.getOnPayAmount();
 				WeiXinAtcion.wechatRefund(order.getOrderNo()+"", order.getAmount().subtract(order.getVoucherAmount()).subtract(order.getPrePayCardAmount()).subtract(order.getOnPayAmount()).multiply(new BigDecimal("100")).intValue(), paymentOperateBean.getAmount().multiply(new BigDecimal("100")).intValue(),refoundNotifyUrl);
 				WeiXinAtcion.wechatRefund(order.getOrderNo()+"", order.getAmount().subtract(order.getVoucherAmount()).subtract(order.getPrePayCardAmount()).subtract(order.getOnPayAmount()).multiply(new BigDecimal("100")).intValue(), paymentOperateBean.getAmount().multiply(new BigDecimal("100")).intValue(),refoundNotifyUrl);
 				PayOrderOperateResponseBean payBean = new PayOrderOperateResponseBean();
 				PayOrderOperateResponseBean payBean = new PayOrderOperateResponseBean();
 				payBean.setResultCode(CorePaymentService.SUCCESS);
 				payBean.setResultCode(CorePaymentService.SUCCESS);