Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

ace-common/src/main/java/com/github/wxiaoqi/security/common/config/rabbit/RabbitConstant.java

@@ -16,8 +16,12 @@ public class RabbitConstant {
     public static final String INTEGRAL = "integral";
     public static final String INTEGRAL_TOPIC = INTEGRAL + TOPIC_EXC;
     /**************************key*********************************/
-    public static final String KEY_REGISTER_SUCCESS = "register.success";
+    public static final String KEY_APPUSER_REGISTER = "appUser.register";
+    public static final String KEY_APPUSER_AUTH = "appUser.auth";
     public static final String INTEGRAL_ROUTING_KEY = "integral_routing_key";
+    public static final String KEY_ORDER_PAY = "order.pay";
+    public static final String KEY_ORDER_FINLISH = "order.finlish";
+    public static final String KEY_ORDER_CANCEL = "order.cancel";
     static {
         exchangeTopicSet = new HashSet<String>() {{
            add(ADMIN_TOPIC);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -275,10 +275,8 @@ public class AppPermissionService {
                 //判断处理活动关键字
                 String[] codes = code.split("_");
                 if(codes.length > 1) {
-                    code = codes[0];
-                    activityCode = codes[1];
+                    parentId=appUserDetailBiz.getUserByCode(codes[0]);
                 }
-                parentId=appUserDetailBiz.getUserByCode(code);
             }
             if(parentId!=null&&parentId>0){
                 rsUserDetail.setInviterAccount(parentId);
@@ -343,8 +341,10 @@ public class AppPermissionService {
             switch (sign){
                 case 1 :
                     mqSenderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, KEY_APPUSER_REGISTER, JSONUtil.toJsonStr(registerQueueDTO));
+                    break;
                 case 2 :
                     mqSenderFeign.sendMessage(RabbitConstant.ADMIN_TOPIC, KEY_APPUSER_AUTH, JSONUtil.toJsonStr(registerQueueDTO));
+                    break;
                 default:
                     break;
             }

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -64,6 +64,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
     @Value("${universal.url}")
     String weixinHost;
 
+    String notifyUrl = weixinHost + "/service/payment/notify/alipay";
+
     public JSONObject preparepay( OrderPayVo orderPayVo) {
         if(null == orderPayVo) {
             log.error("-----参数为空-----------");
@@ -260,7 +262,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
     @SuppressWarnings("rawtypes")
     private ObjectRestResponse generateAliPayment(String orderCode, String description, String payType, Integer amount) {
         BigDecimal realAmount = new BigDecimal(amount.toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
-        String notifyUrl =SystemConfig.weixinHost + "/service/payment/notify/alipay";
+        String notifyUrl = weixinHost + "/service/payment/notify/alipay";
 
         //实例化客户端
         AlipayClient alipayClient = new DefaultAlipayClient(SystemConfig.ALIPAY_PAY_BASE_URL + "/gateway.do",
@@ -302,7 +304,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
     //预授权冻结
     public ObjectRestResponse fundAuthOrderAppFreeze(AlipayClient alipayClient) throws AlipayApiException {
         AlipayFundAuthOrderAppFreezeRequest request = new AlipayFundAuthOrderAppFreezeRequest();
-        String notifyUrl =SystemConfig.weixinHost + "/service/payment/notify/alipay";
+
         AlipayFundAuthOrderAppFreezeModel model = new AlipayFundAuthOrderAppFreezeModel();
         model.setOrderTitle("支付宝预授权");
         model.setOutOrderNo("2018077735255938023");//替换为实际订单号