Merge remote-tracking branch 'origin/master'

src/main/java/com/lightinit/hsdataportal/impl/RequirementMicroappServiceImpl.java

@@ -102,6 +102,7 @@ public class RequirementMicroappServiceImpl implements IRequirementMicroappServi
         DynamicDataContextHolder.setCustomerType(DynamicDataContextHolder.DEFAULT);
         ResultState<Long> resultState = new ResultState<Long>();
         inputModel.setCreatedAt(new Date());
+        inputModel.setReceivedAt(new Date());
         RequirementReceive requirementReceive = new RequirementReceive();
         BeanUtils.copyProperties(inputModel,requirementReceive);
               int  sqlResult=requirementReceiveMapper.insert(requirementReceive);

src/main/java/com/lightinit/hsdataportal/model/ReceiveListModel.java

@@ -7,10 +7,29 @@ public class ReceiveListModel {
     private Long id;
     private String rqrmntName;
     private String rqrmntType;
+    private Long publishBy;
     private String userName;
-    private Date receivedAt;
-    private BigDecimal money;
+    private String phone;
     private  Date deadline;
+    private BigDecimal money;
+    private Date receivedAt;
+
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+
+    public Long getPublishBy() {
+        return publishBy;
+    }
+
+    public void setPublishBy(Long publishBy) {
+        this.publishBy = publishBy;
+    }
 
     public Date getDeadline() {
         return deadline;

src/main/resources/sqlmaps/RequirementApiMapper.xml

@@ -675,7 +675,7 @@
   </select>
   <select id="selectReceiveList" parameterType="java.lang.Long"  resultType="com.lightinit.hsdataportal.model.APIReceiveListModel">
       SELECT
-       u.`username`,u.`phone`,rr.`created_at`,rr.solution
+       u.`username`,rr.`phone`,rr.`received_at`,rr.solution
        FROM
         `requirement` r
        JOIN `requirement_api` rm ON r.id = rm.`id`

src/main/resources/sqlmaps/RequirementReceiveMapper.xml

@@ -357,14 +357,15 @@
   </update>
   <select id="selectList" parameterType="java.lang.Long" resultType="com.lightinit.hsdataportal.model.ReceiveListModel">
     SELECT
-  r.rqrmnt_name,
-  r.rqrmnt_type,
-  r.publish_by,
-  u.`username`userName,
+  r.rqrmnt_name as 'rqrmntName',
+  r.rqrmnt_type as 'rqrmntType',
+  r.publish_by as 'publishBy',
+  u.username as 'userName',
   rr.solution,
   rr.phone,
-  ra.`deadline` deadline,
-  ra.expected_quote money
+  ra.deadline,
+  ra.expected_quote as 'money',
+  rr.received_at  as 'receivedAt'
 FROM
   `requirement` r
   JOIN `requirement_api` ra ON r.`id` = ra.`id`
@@ -376,14 +377,15 @@ FROM
     WHERE u.id=#{id}
 UNION
 SELECT
-  r.rqrmnt_name,
-  r.rqrmnt_type,
-  r.publish_by,
-   u.`username`userName,
+  r.rqrmnt_name as 'rqrmntName',
+  r.rqrmnt_type as 'rqrmntType',
+  r.publish_by as 'publishBy',
+  u.username as 'userName',
   rr.solution,
   rr.phone,
-  rm.`deadline` deadline,
-  rm.money money
+  rm.deadline,
+  rm.money money,
+  rr.received_at  as 'receivedAt'
 
 FROM
   `requirement` r

src/main/webapp/pages/open/account/register.jsp

@@ -241,16 +241,16 @@
                             $("#btn_register").attr("disabled",false);
                             $.post("<%=basePath%>/open/account/register.action",$("#registerFrom").serialize(),function (datas) {
                                 if (datas.ms=='参数不能为空'){
-                                    alert("参数不能为空") ;
+                                    swal("参数不能为空") ;
                                 }else if (datas.msg=='密码不一致'){
                                     $("#mima").show() ;
                                 }else if (datas.msg=='用户名已存在'){
                                     $("#name").show() ;
                                 } else if(datas.stateCode==200){
-                                    alert("注册成功") ;
+									swal("注册成功") ;
                                     window.location.href='<%=basePath%>/open/account/login.htm' ;
                                 }else {
-                                    alert(datas.msg) ;
+									swal(datas.msg) ;
                                 }
                             },"json") ;
                         }else {
@@ -262,16 +262,16 @@
 				}else {
                     $.post("<%=basePath%>/open/account/register.action",$("#registerFrom").serialize(),function (datas) {
                         if (datas.ms=='参数不能为空'){
-                            alert("参数不能为空") ;
+							swal("参数不能为空") ;
                         }else if (datas.msg=='密码不一致'){
                             $("#mima").show() ;
                         }else if (datas.msg=='用户名已存在'){
                             $("#name").show() ;
                         } else if(datas.stateCode==200){
-                            alert("注册成功") ;
+							swal("注册成功") ;
                             window.location.href='<%=basePath%>/open/account/login.htm' ;
                         }else {
-                            alert(datas.msg) ;
+							swal(datas.msg) ;
                         }
                     },"json") ;
 				}

src/main/webapp/pages/open/myAccount/recharge.jsp

@@ -35,7 +35,7 @@
                 <div class="cz00">
                     <form id="fromRecharge">
                         <span class="cz-font"><span class="xinghao" >*</span>充值金额：</span>
-                        <input type="text" name="orderAmount" placeholder="" class="cz">
+                        <input type="number" name="orderAmount" id="orderAmount" placeholder="" class="cz">
                         <button type="button"  onclick="toRecharge()" class="cz-but">充值</button>
                     </form>
 
@@ -51,11 +51,17 @@
 </body>
 <script>
 function toRecharge() {
+    var amount = $("#orderAmount").val();
+    if (isNaN(amount) || amount <= 0){
+        $("#orderAmount").val(0);
+        swal("请输入正确的金额！");
+        return
+    }
     $.post("<%=basePath%>/open/myAccount/toRecharge.action",$("#fromRecharge").serialize(),function (ret) {
         if(ret.stateCode==200) {
             location.href="<%=basePath%>/open/myAccount/payment.htm?orderNumber="+ret.data.orderNumber+"&orderAmount="+ret.data.orderAmount;
         }else {
-            alert("充值失败")
+            swal("充值失败")
         }
     })
 }

src/main/webapp/pages/open/myrequirement/myapi/receiveList.jsp

@@ -35,7 +35,7 @@
                     </tr>
                     <c:forEach items="${list}" var="item">
                         <tr>
-                            <td><fmt:formatDate value="${item.created_at}" pattern="yyyy-MM-dd"></fmt:formatDate></td>
+                            <td><fmt:formatDate value="${item.receivedAt}" pattern="yyyy-MM-dd"></fmt:formatDate></td>
                             <td>${item.userName}</td>
                             <td>${item.phone}</td>
                             <td style="display: none">${item.solution}</td>