Aidea product update by Strive Date 2020-11-23

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/service/impl/ConsultSheetServiceImpl.java

@@ -200,8 +200,10 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
                 return true;
             }
 
-            userConds.equal("t.id", order.getDoctorId());
-            user = qyuserService.fetchSearchByConds(userConds);
+            Conds docConds = new Conds();
+            docConds.equal("t.del_flag", Constants.DEL_FLAG_0);
+            docConds.equal("t.id", order.getDoctorId());
+            user = qyuserService.fetchSearchByConds(docConds);
             if (user.getPeakVal() > 0) {//药师峰值大于0
                 consultSheet.setDoctorId(user.getId());
             } else {//普通轮询

aidea-modules/order-module-web/src/main/webapp/WEB-INF/views/order/orderlist.html

@@ -207,6 +207,7 @@
                                     <th>支付交易号</th>
                                     <th>是否开票</th>
                                     <th>创建时间</th>
+                                    <th>付款时间</th>
                                     <th>操作</th>
                                 </tr>
                                 </thead>
@@ -358,6 +359,10 @@
                     "mData": "createTime"
                 }
                 ,
+                {
+                    "mData": "payTime"
+                }
+                ,
                 {
                     "mData": "id"
                 }
@@ -412,7 +417,7 @@
                     "mData": "nickName",
                     "mRender": function (a, b, c, d) {
                         if (a) {
-                            return a.slice(0, 1) + '*' + a.slice(2, 3);
+                            return a;
                         } else {
                             return null;
                         }
@@ -472,7 +477,7 @@
                 ,
                 {
                     "aTargets": [12],
-                    "mData": "createTime",
+                    "mData": "payTime",
                     "mRender": function (a, b, c, d) {
                         return formatDates(a);
                     }
@@ -480,6 +485,18 @@
                 ,
                 {
                     "aTargets": [13],
+                    "mData": "createTime",
+                    "mRender": function (a, b, c, d) {
+                        let time = formatDates(a);
+                        if (time.indexOf("1970") != -1) {
+                            return '';
+                        }
+                        return formatDates(a);
+                    }
+                }
+                ,
+                {
+                    "aTargets": [14],
                     "mData": "id",
                     "mRender": function (a, b, c, d) {
                         var html = '#if($shiro.hasPermission("qy:order:edit"))';

aidea-modules/order-module/src/main/java/com/cftech/order/dao/OrderMapper.xml

@@ -46,6 +46,7 @@
         <result column="service_id" property="serviceId"/>
         <result column="doctor_id" property="doctorId"/>
         <result column="openid" property="openid"/>
+        <result column="pay_time" property="payTime"/>
         <result column="pay_status" property="payStatus"/>
         <result column="pay_amount" property="payAmount"/>
         <result column="order_amount" property="orderAmount"/>
@@ -111,6 +112,7 @@
         o.consult_id,
         t.product_name,
         o.number,
+        o.pay_time,
         o.pay_amount,
         o.order_amount,
         o.total_amount,
@@ -215,7 +217,7 @@
             #{payAmount, jdbcType=DECIMAL},
             #{orderAmount, jdbcType=DECIMAL},
             #{totalAmount, jdbcType=DECIMAL},
-            now(),
+            #{payTime, jdbcType=TIMESTAMP},
             #{tradeNo, jdbcType=VARCHAR},
             #{courierNumber, jdbcType=VARCHAR},
             #{confirm, jdbcType=VARCHAR},
@@ -398,7 +400,7 @@
                 address_des = #{addressDes, jdbcType=VARCHAR},
             </if>
             <if test="orderTime != null">
-                order_time = #{orderTime, jdbcType=VARCHAR}
+                order_time = #{orderTime, jdbcType=TIMESTAMP}
             </if>
         </set>
         where id=#{id,jdbcType=BIGINT}
@@ -475,6 +477,9 @@
             <if test="status != null">
                 status = #{status},
             </if>
+            <if test="status != null and status == 2">
+                pay_time = now(),
+            </if>
             <if test="orderCancel!=null and orderCancel != ''">
                 order_cancel = #{orderCancel}
             </if>

aidea-modules/product-classify-module-web/src/main/webapp/WEB-INF/views/productclassify/productclassifyform.html

@@ -119,8 +119,8 @@
                                 >
                             </div>
 
-                            <div class="form-group form-md-line-input col-md-12" id="img">
-                            </div>
+                            <!--<div class="form-group form-md-line-input col-md-12" id="img">-->
+                            <!--</div>-->
 
                             <div class="form-group form-md-line-input col-md-12">
                                 <label>是否推荐</label>
@@ -253,20 +253,6 @@
                     messages: {},
                     submitHandler: function (form) {
                         var data =  $("#myForm").serializeJSON();
-                        var classifyImg = coverPP.getStringValues().split(',')[0];
-                        var flag = true;
-                        if(classifyImg == ''){
-                            flag = false;
-                            Cfapp.alert({
-                                message: "请上传图片",
-                                btntext: "确定",
-                                success: function () {
-                                    return false;
-                                }
-                            });
-                        }
-                        if(flag){
-                            data.classifyImg = classifyImg;
                         $("#save").attr("disabled", true);
                         $.post("#springUrl('/a/productclassify/formData')", data, function(returnobj) {
                             $("#save").attr("disabled", false);
@@ -300,7 +286,7 @@
                                 });
                             }
                         });
-                        }
+
 
                     }
                 })

cftech-common-web/src/main/resources/common-test.properties

@@ -40,7 +40,7 @@ LOG_URL=http://www.michang-tech.com.cn:6989/log/addlog
 #\u6821\u9A8C\u5151\u6362\u5BC6\u7801KEY
 MEMBER_PASSWORD_KEY=DONGCHANGINT9527;
 list.refreshtoken=true
-jwt.domain=pd.shxrtech.com
+jwt.domain=127.0.0.1
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD
 jwt.duration=86400000
 #\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\uFFFD\u03AAtrue