创客额度相关,分享改bug，

pluss-wap-page/src/main/java/cn/pluss/platform/controller/component/PayCallbackConsumer.java

@@ -1,5 +1,6 @@
 package cn.pluss.platform.controller.component;
 
+import cn.pluss.platform.UserMakerQuota.UserMakerQuotaService;
 import cn.pluss.platform.entity.MerchantOrder;
 import cn.pluss.platform.merchantOrder.MerchantOrderService;
 import cn.pluss.platform.merchantProfit.MerchantProfitService;
@@ -30,6 +31,9 @@ public class PayCallbackConsumer {
     @Resource
     private RealFansService realFansService;
 
+    @Resource
+    private UserMakerQuotaService userMakerQuotaService;
+
     @RabbitHandler
     public void process(String msg) {
         log.info("接受到的消息内容为:{}", msg);
@@ -42,6 +46,8 @@ public class PayCallbackConsumer {
            // realFansService.createFansProfit(order);
         }
         merchantProfitService.createOrderProfitV2(order,"1");
+        //判断是否创客增加额度
+        userMakerQuotaService.quotaInfo(order);
         MerchantOrder update = new MerchantOrder();
         update.setId(order.getId());
         update.setProfitShareMoney(order.getProfitShareMoney());

pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/MerchantController.java

@@ -2491,7 +2491,7 @@ public class MerchantController {
             }else {
                 inviteNum=params[0].split("=")[1];
                 result.put("typeCode",params[1].split("=")[1]);
-                result.put("currentFee",(params[1].split("=").length<=1)?"":params[1].split("=")[1]);
+                result.put("currentFee",(params[2].split("=").length<=1)?"":params[2].split("=")[1]);
             }
             String phone = "";
             String userName = "";
@@ -2595,7 +2595,7 @@ public class MerchantController {
                 userInfo.setCreateTime(new Date());
                 userInfo.setTypeCode(typeCode == null? userInfo.getTypeCode(): typeCode);
                 userInfo.setCurrentFee(currentFee== null? userInfo.getCurrentFee(): currentFee);
-                userInfoService.saveUserInfo(userInfo);
+
                 UserApp userApp = new UserApp();
                 userApp.setUserId(userInfo.getId());
 
@@ -2649,12 +2649,21 @@ public class MerchantController {
 
                 promotion.setIsExtend(promotion.getTypeCode().equals("MC")?"0":"1");
                 promotion.setCreateTime(new Date());
-                userPromotionMapper.insert(promotion);
+
                 // 可能和数据库存储的数据不一致
                 userInfo.setCreateTime(null);
 
-                userAppService.save(userApp);
-                ipRecordService.saveRegIp(userInfo.getId() + "", userInfo.getId() + "");
+
+
+                userInfoService.goregister(userInfo,userApp,promotion);
+
+
+
+
+
+
+
+
                 PhoneValidateCode phoneValidate = new PhoneValidateCode();
                 if (StringUtil.isNotEmpty(phone)) {
                     phoneValidate.setPhone(phone);

pluss-wap-page/src/main/resources/templates/th_pay.html

@@ -10,6 +10,16 @@
     <!--    <link rel="stylesheet" href="https://act.weixin.qq.com/static/cdn/css/wepayui/0.1.1/wepayui.min.css">-->
     <script src="https://www.shouyinbei.net/resources/js/alipayjsapi.min3.1.1.js"></script>
     <title>向商户付款</title>
+    <script>
+        window.alert = function (name) {
+            var iframe = document.createElement("IFRAME");
+            iframe.style.display = "none";
+            iframe.setAttribute("src", 'data:text/plain,');
+            document.documentElement.appendChild(iframe);
+            window.frames[0].window.alert(name);
+            iframe.parentNode.removeChild(iframe);
+        }
+    </script>
     <style>
         * {
             padding: 0;

pluss-wap-page/src/main/webapp/WEB-INF/jsp/merchant/share.jsp

@@ -8,6 +8,7 @@
             <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
             <script src="http://code.jquery.com/jquery-1.8.3.min.js"></script>
             <script src="http://passport.cnblogs.com/scripts/jsencrypt.min.js"></script>
+            <script type="text/javascript" src="/wap/resources/js/zepto.weui.js"></script>
             <title>分享</title>
             <style>
                 div,