Aidea product update by Strive Date 2020-11-20

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/dao/ConsultSheetMapper.xml

@@ -29,6 +29,8 @@
         <result column="drugs_id" property="drugsId"></result>
         <result column="member_id" property="memberId"></result>
         <result column="order_id" property="orderId"></result>
+        <result column="address_id" property="addressId"></result>
+        <result column="audit_time" property="auditTime"></result>
     </resultMap>
 
     <sql id="sqlWhere">
@@ -85,9 +87,12 @@
         a.drugs_id,
         a.member_id,
         a.order_id,
+        a.address_id,
+        a.audit_time,
         b.`name` pharmaName,
         c.`name` customerName
     </sql>
+
     <sql id="sqlCol">
         id,
         CONVERT(AES_DECRYPT(user_name,'aideakey') USING UTF8) userName,
@@ -102,8 +107,8 @@
         description,
         allergy,
         symptom,
-        open_id
-
+        open_id,
+        consult_id consultId
     </sql>
 
     <insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true"
@@ -135,7 +140,9 @@
             open_id,
             drugs_id,
             member_id,
-            order_id
+            order_id,
+            address_id,
+            audit_time
         )
         values
         (
@@ -160,21 +167,25 @@
             #{updateBy, jdbcType=BIGINT},
             #{allergy, jdbcType=VARCHAR},
             #{symptom, jdbcType=VARCHAR},
-            #{diagnosis,jdbcType=BIGINT},
+            #{diagnosis, jdbcType=BIGINT},
             #{openId, jdbcType=VARCHAR},
-            #{drugsId,jdbcType=BIGINT},
-            #{memberId,jdbcType=BIGINT},
-            #{orderId,jdbcType=BIGINT}
+            #{drugsId, jdbcType=BIGINT},
+            #{memberId, jdbcType=BIGINT},
+            #{orderId, jdbcType=BIGINT},
+            #{addressId, jdbcType=VARCHAR},
+            #{auditTime, jdbcType=TIMESTAMP},
         )
     </insert>
 
-    <select id="fetchById" parameterType="java.lang.Long" resultMap="resultMap">
+    <select id="fetchById" parameterType="java.lang.Long" resultMap="com.cftech.consultsheet.model.ConsultSheet">
         SELECT
-        <include refid="sqlColumns"/>
+        <include refid="sqlColumns"/>, d.name pharmacist,e.org_name hospital
         FROM t_aidea_consult_sheet a
         LEFT JOIN t_qyuser b ON b.id = a.doctor_id
         LEFT JOIN t_qyuser c ON c.id = a.service_id
-        WHERE a.id=#{id}
+        LEFT JOIN t_qyuser d ON d.id = a.past_records
+        LEFT JOIN t_qyuser e ON e.id = a.allergy
+        WHERE a.id = #{id}
     </select>
 
     <select id="count" parameterType="java.util.Map" resultType="java.lang.Integer">
@@ -186,10 +197,11 @@
 
     </select>
 
-    <select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap">
+    <select id="fetchSearchByPage" parameterType="java.util.Map" resultType="com.cftech.consultsheet.model.ConsultSheet">
         SELECT
-        <include refid="sqlColumns"/>
+        <include refid="sqlColumns"/>, o.number orderCode
         FROM t_aidea_consult_sheet a
+        LEFT JOIN t_order o ON a.order_id = o.id
         LEFT JOIN t_qyuser b ON b.id = a.doctor_id
         LEFT JOIN t_qyuser c ON c.id = a.service_id
         <include refid="sqlWhere"/>
@@ -207,7 +219,7 @@
                 and open_id = #{openid}
             </if>
             <if test="name!=null and name !=''">
-                and CONVERT(AES_DECRYPT(user_name,'aideakey') USING UTF8) like concat('%',#{name},'%')
+                and (CONVERT(AES_DECRYPT(user_name,'aideakey') USING UTF8) like concat('%',#{name},'%') OR consult_id like concat('%',#{name},'%'))
             </if>
             <if test="id!=null">
                 and id = #{id}
@@ -233,7 +245,6 @@
             <if test="numberId != null">
                 number_id = AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'),
             </if>
-
             <if test="sex != null">
                 sex = #{sex, jdbcType=BIGINT},
             </if>
@@ -297,6 +308,12 @@
             <if test="openId != null">
                 order_id = #{orderId, jdbcType=BIGINT},
             </if>
+            <if test="addressId != null">
+                address_id = #{addressId, jdbcType=BIGINT},
+            </if>
+            <if test="auditTime != null">
+                audit_time = #{auditTime, jdbcType=TIMESTAMP},
+            </if>
         </set>
         where id=#{id,jdbcType=BIGINT}
     </update>
@@ -315,18 +332,18 @@
                 description = #{description}
             </if>
         </set>
-        where id = #{id}
+        where id = #{consultId}
     </update>
 
-    <update id="updateStatus" >
+    <update id="updateStatus">
         update t_aidea_consult_sheet
         <set>
             <if test="status !=null">
                 status = #{status}
             </if>
+
         </set>
-        where id = #{id}
+        where id = #{consultId}
     </update>
 
-
 </mapper>

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheet.java

 package com.cftech.consultsheet.model;
 
-import com.alibaba.fastjson.annotation.JSONField;
 import com.cftech.core.poi.ExportConfig;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
-import org.codehaus.jackson.format.DataFormatMatcher;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -19,7 +15,6 @@ import java.util.Date;
 @Data
 public class ConsultSheet extends UserSheet implements Serializable {
 
-
     /* 主键id */
     private Long id;
     /* 咨询单编码 */
@@ -36,17 +31,13 @@ public class ConsultSheet extends UserSheet implements Serializable {
     /* 手机号 */
     @ExportConfig(value = "联系电话", width = 100, showLevel = 1)
     private String phone;
-    /* 有无不良反应 */
-    @ExportConfig(value = "有无不良反应", width = 100, showLevel = 1)
-    private Long pastRecords;
-    /* 有无过敏反应 */
-    @ExportConfig(value = "有无过敏反应", width = 100, showLevel = 1)
-    private Long allergy;
-    /* 是否服用过该药且无禁忌症 */
-    @ExportConfig(value = "是否服用过该药且无禁忌症", width = 100, showLevel = 1)
+    /* 处方医院组织长字段 */
     private Long illness;
+    /* 处方医院 */
+    private Long allergy;
+    /* 处方医生 */
+    private Long pastRecords;
     /* 处方单 */
-    @ExportConfig(value = "处方单", width = 100, showLevel = 1)
     private String prescription;
     /* 药师id */
     private Long doctorId;
@@ -82,7 +73,25 @@ public class ConsultSheet extends UserSheet implements Serializable {
     /* 订单id */
     private Long orderId;
 
+    /**
+     * 审核时间
+     */
+    private String auditTime;
+
+    private String addressId;
+
+    /**
+     * 无数据库映射字段
+     */
     private String appId;
+    private String orderCode;
+    private String startCreateTime;
+    private String endCreateTime;
+    private String startAuditTime;
+    private String endAuditTime;
+    private String hospital;//处方医院
+    private String pharmacist;//处方医生
+
     public ConsultSheet() {
         this.delFlag = false;
         this.status = "0";

aidea-modules/consult-module/src/main/java/com/cftech/consultsheet/model/ConsultSheetDto.java

@@ -9,6 +9,7 @@ import lombok.Data;
  */
 @Data
 public class ConsultSheetDto {
+
     /*搜索条件*/
     private String name;
     private Long id;

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

@@ -176,31 +176,31 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
         conds.in("o.status", new String[]{"2", "3", "4"});//2 待发货，3：待收货 4:待付款
         int count = orderService.count(conds);
         if (count > 0) { //复购
-            Conds memberConds = new Conds();
-            memberConds.equal("del_flag", Constants.DEL_FLAG_0);
-            memberConds.equal("open_id", openid);
-            Member member = memberService.fetchSearchByConds(conds);
-
-            String serviceId = member.getServiceId();
-            Conds userConds = new Conds();
-            userConds.equal("t.del_flag", Constants.DEL_FLAG_0);
-            userConds.equal("t.id", serviceId);
-            Qyuser user = qyuserService.fetchSearchByConds(userConds);
-            if (user.getPeakVal() > 0) {//客服峰值大于0
-                consultSheet.setServiceId(user.getId());
-                //推送消息
-            } else {//普通轮询
-                firstCustomerProcess(consultSheet);
-            }
-
-            String doctorId = member.getDoctorId();
-            userConds.equal("t.id", doctorId);
-            user = qyuserService.fetchSearchByConds(userConds);
-            if (user.getPeakVal() > 0) {//药师峰值大于0
-                consultSheet.setDoctorId(user.getId());
-            } else {//普通轮询
+//            Conds memberConds = new Conds();
+//            memberConds.equal("del_flag", Constants.DEL_FLAG_0);
+//            memberConds.equal("open_id", openid);
+//            Member member = memberService.fetchSearchByConds(memberConds);
+//
+//            String serviceId = member.getServiceId();
+//            Conds userConds = new Conds();
+//            userConds.equal("t.del_flag", Constants.DEL_FLAG_0);
+//            userConds.equal("t.id", serviceId);
+//            Qyuser user = qyuserService.fetchSearchByConds(userConds);
+//            if (user.getPeakVal() > 0) {//客服峰值大于0
+//                consultSheet.setServiceId(user.getId());
+//                //推送消息
+//            } else {//普通轮询
+//                firstCustomerProcess(consultSheet);
+//            }
+//
+//            String doctorId = member.getDoctorId();
+//            userConds.equal("t.id", doctorId);
+//            user = qyuserService.fetchSearchByConds(userConds);
+//            if (user.getPeakVal() > 0) {//药师峰值大于0
+//                consultSheet.setDoctorId(user.getId());
+//            } else {//普通轮询
                 firstCustomerProcess(consultSheet);
-            }
+            //}
         } else {//首次购买
             firstCustomerProcess(consultSheet);
         }

aidea-modules/consult-module/target/classes/com/cftech/consultsheet/dao/ConsultSheetMapper.xml

@@ -29,6 +29,8 @@
         <result column="drugs_id" property="drugsId"></result>
         <result column="member_id" property="memberId"></result>
         <result column="order_id" property="orderId"></result>
+        <result column="address_id" property="addressId"></result>
+        <result column="audit_time" property="auditTime"></result>
     </resultMap>
 
     <sql id="sqlWhere">
@@ -85,9 +87,12 @@
         a.drugs_id,
         a.member_id,
         a.order_id,
+        a.address_id,
+        a.audit_time,
         b.`name` pharmaName,
         c.`name` customerName
     </sql>
+
     <sql id="sqlCol">
         id,
         CONVERT(AES_DECRYPT(user_name,'aideakey') USING UTF8) userName,
@@ -102,8 +107,8 @@
         description,
         allergy,
         symptom,
-        open_id
-
+        open_id,
+        consult_id consultId
     </sql>
 
     <insert id="save" parameterType="com.cftech.consultsheet.model.ConsultSheet" useGeneratedKeys="true"
@@ -135,7 +140,9 @@
             open_id,
             drugs_id,
             member_id,
-            order_id
+            order_id,
+            address_id,
+            audit_time
         )
         values
         (
@@ -160,21 +167,25 @@
             #{updateBy, jdbcType=BIGINT},
             #{allergy, jdbcType=VARCHAR},
             #{symptom, jdbcType=VARCHAR},
-            #{diagnosis,jdbcType=BIGINT},
+            #{diagnosis, jdbcType=BIGINT},
             #{openId, jdbcType=VARCHAR},
-            #{drugsId,jdbcType=BIGINT},
-            #{memberId,jdbcType=BIGINT},
-            #{orderId,jdbcType=BIGINT}
+            #{drugsId, jdbcType=BIGINT},
+            #{memberId, jdbcType=BIGINT},
+            #{orderId, jdbcType=BIGINT},
+            #{addressId, jdbcType=VARCHAR},
+            #{auditTime, jdbcType=TIMESTAMP},
         )
     </insert>
 
-    <select id="fetchById" parameterType="java.lang.Long" resultMap="resultMap">
+    <select id="fetchById" parameterType="java.lang.Long" resultMap="com.cftech.consultsheet.model.ConsultSheet">
         SELECT
-        <include refid="sqlColumns"/>
+        <include refid="sqlColumns"/>, d.name pharmacist,e.org_name hospital
         FROM t_aidea_consult_sheet a
         LEFT JOIN t_qyuser b ON b.id = a.doctor_id
         LEFT JOIN t_qyuser c ON c.id = a.service_id
-        WHERE a.id=#{id}
+        LEFT JOIN t_qyuser d ON d.id = a.past_records
+        LEFT JOIN t_qyuser e ON e.id = a.allergy
+        WHERE a.id = #{id}
     </select>
 
     <select id="count" parameterType="java.util.Map" resultType="java.lang.Integer">
@@ -186,10 +197,11 @@
 
     </select>
 
-    <select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMap">
+    <select id="fetchSearchByPage" parameterType="java.util.Map" resultType="com.cftech.consultsheet.model.ConsultSheet">
         SELECT
-        <include refid="sqlColumns"/>
+        <include refid="sqlColumns"/>, o.number orderCode
         FROM t_aidea_consult_sheet a
+        LEFT JOIN t_order o ON a.order_id = o.id
         LEFT JOIN t_qyuser b ON b.id = a.doctor_id
         LEFT JOIN t_qyuser c ON c.id = a.service_id
         <include refid="sqlWhere"/>
@@ -197,6 +209,7 @@
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
         <if test="limit>0">limit #{offset},#{limit}</if>
     </select>
+
     <select id="consultSheetList" resultType="com.cftech.consultsheet.model.ConsultSheet">
         SELECT
           <include refid="sqlCol"/>
@@ -206,14 +219,14 @@
                 and open_id = #{openid}
             </if>
             <if test="name!=null and name !=''">
-            and user_name like concat('%',#{name},'%')
+                and (CONVERT(AES_DECRYPT(user_name,'aideakey') USING UTF8) like concat('%',#{name},'%') OR consult_id like concat('%',#{name},'%'))
             </if>
             <if test="id!=null">
                 and id = #{id}
             </if>
             ORDER BY create_time DESC
             <if test="page!=null and pageSize !='' and pageSize!=null and page !=''">
-            limit #{page},#{pageSize}
+                limit #{page}, #{pageSize}
             </if>
     </select>
 
@@ -232,7 +245,6 @@
             <if test="numberId != null">
                 number_id = AES_ENCRYPT(#{numberId, jdbcType=VARBINARY},'aideakey'),
             </if>
-
             <if test="sex != null">
                 sex = #{sex, jdbcType=BIGINT},
             </if>
@@ -296,6 +308,12 @@
             <if test="openId != null">
                 order_id = #{orderId, jdbcType=BIGINT},
             </if>
+            <if test="addressId != null">
+                address_id = #{addressId, jdbcType=BIGINT},
+            </if>
+            <if test="auditTime != null">
+                audit_time = #{auditTime, jdbcType=TIMESTAMP},
+            </if>
         </set>
         where id=#{id,jdbcType=BIGINT}
     </update>
@@ -314,7 +332,7 @@
                 description = #{description}
             </if>
         </set>
-        where consult_id = #{consultId}
+        where id = #{consultId}
     </update>
 
     <update id="updateStatus">
@@ -325,8 +343,7 @@
             </if>
 
         </set>
-        where consult_id = #{consultId}
+        where id = #{consultId}
     </update>
 
-
 </mapper>

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

@@ -110,15 +110,15 @@
                                             >
                                         </div>
 
-                                        <div class="form-group form-md-line-input col-xs-5">
-                                            <label>收货地址<font style="color: red"></font></label>
-                                            <input type="text"
-                                                   class="form-control" name="address"
-                                                   id="address" readonly="readonly"
-                                                   maxlength="50" placeholder="收货地址"
-                                                   value="$!{data.address}"
-                                            >
-                                        </div>
+                                        <!--<div class="form-group form-md-line-input col-xs-5">-->
+                                            <!--<label>收货地址<font style="color: red"></font></label>-->
+                                            <!--<input type="text"-->
+                                                   <!--class="form-control" name="address"-->
+                                                   <!--id="address" readonly="readonly"-->
+                                                   <!--maxlength="50" placeholder="收货地址"-->
+                                                   <!--value="$!{data.address}"-->
+                                            <!--&gt;-->
+                                        <!--</div>-->
                                         <div class="form-group form-md-line-input col-xs-5">
                                             <label>订单状态<font style="color: red"></font></label>
                                             <input type="text"
@@ -355,7 +355,7 @@
             var amountPrice = countSi * item.price
             var amountTmp = amountPrice.toFixed(2)
             var item = areaList[0]
-            HtmlAmount += `<input id="htmlAmount" class="form-control" name="htmlAmount"  data-price="${item.id}" style="width: 180px;margin-right: 50px" type="text"  readonly="readonly"  value="${amountTmp}"></input>`
+            HtmlAmount += `<input id="htmlAmount" class="form-control" name="htmlAmount"  data-price="${item.id}" style="width: 180px;margin-right: 50px" type="number" value="${amountTmp}"></input>`
         }
 
 

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

@@ -19,7 +19,8 @@ import java.util.Map;
 public interface OrderMapper extends GenericDao<Order> {
 
     Integer deleteAll(@Param("id") Long id);
-    Integer updateStatus(@Param("id") Long id);
+
+    Integer updateStatus(Map<String, Object> params);
 
     List<Order> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long id);
 

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

@@ -33,11 +33,13 @@
         <result column="courier_number" property="courierNumber"/>
         <result column="address_id" property="addressId"/>
         <result column="clerk_id" property="clerkId"/>
+        <result column="address_des" property="addressDes"/>
     </resultMap>
 
     <resultMap id="resultMapList" type="com.cftech.order.model.Order">
         <id column="id" property="id"/>
         <result column="consult_id" property="consultId"/>
+        <result column="openid" property="openid"/>
         <result column="number" property="number"/>
         <result column="member_id" property="memberId"/>
         <result column="service_id" property="serviceId"/>
@@ -65,7 +67,9 @@
         <result column="product_name" property="productName"/>
         <result column="address_id" property="addressId"/>
         <result column="courier_number" property="courierNumber"/>
-        <result column="address" property="address"/>
+        <result column="address_des" property="addressDes"/>
+        <result column="consultCode" property="consultCode"/>
+        <result column="nickName" property="nickName"/>
         <collection property="list" ofType="com.cftech.order.model.ProductVO">
             <result column="product_name" property="productName"/>
         </collection>
@@ -101,6 +105,7 @@
 
     <sql id="sqlColumns">
         o.id,
+        o.openid,
         t.product_number,
         o.consult_id,
         t.product_name,
@@ -118,7 +123,7 @@
         o.confirm,
         d.drugs_num,
         o.courier_number,
-        CONCAT(a.areaname, b.areaname, c.areaname,s.address) as address,
+        o.address_des,
         t.id as productId
     </sql>
 
@@ -136,7 +141,7 @@
         o.create_time AS createTime,
         o.confirm,
         o.courier_number AS courierNumber,
-	CONCAT( a.areaname, b.areaname, c.areaname, s.address ) AS address
+        o.address_des
     </sql>
 
     <sql id="sqlColumnProduct">
@@ -194,7 +199,8 @@
             `member_id`,
             `service_id`,
             `doctor_id`,
-            `clerk_id`
+            `clerk_id`,
+            address_des
         )
         values
         (
@@ -208,7 +214,7 @@
             now(),
             #{tradeNo, jdbcType=VARCHAR},
             #{courierNumber, jdbcType=VARCHAR},
-            #{confirm, jdbcType=BIGINT},
+            #{confirm, jdbcType=VARCHAR},
             #{orderCancel, jdbcType=VARCHAR},
             #{remarks, jdbcType=VARCHAR},
             #{accountsId, jdbcType=BIGINT},
@@ -224,7 +230,8 @@
             #{memberId, jdbcType=BIGINT},
             #{serviceId, jdbcType=BIGINT},
             #{doctorId, jdbcType=BIGINT},
-            #{clerkId, jdbcType=BIGINT}
+            #{clerkId, jdbcType=BIGINT},
+            #{addressDes, jdbcType=VARCHAR}
         )
     </insert>
     <update id="deleteAll" >
@@ -256,32 +263,31 @@
     </select>
 
     <select id="count" parameterType="java.util.Map" resultType="java.lang.Integer">
-        SELECT COUNT(1) FROM (select count(1) from t_order o
+        SELECT IFNULL(SUM(col), 0)
+        FROM (
+            SELECT COUNT(1) col
+            FROM t_order o
+            LEFT JOIN t_aidea_consult_sheet cs ON o.consult_id = cs.id
             LEFT JOIN t_shipping_address s ON o.address_id = s.id
             LEFT JOIN t_order_details d ON o.id = d.order_id
             LEFT JOIN t_aidea_product t ON d.drugs_id = t.id
-        LEFT JOIN area a ON s.province_id = a.areaid
-        LEFT JOIN area b ON s.city_id = b.areaid
-        LEFT JOIN area c ON s.area_id = c.areaid
             <include refid="sqlWhere"/>
-        GROUP BY o.id
-        ) b
-
+            <if test="userid != null"> AND (o.service_id = ${userid} or o.doctor_id =${userid} or o.clerk_id = ${userid}) </if>
+            GROUP BY o.id ) duals
     </select>
 
     <select id="fetchSearchByPage" parameterType="java.util.Map" resultMap="resultMapList">
         SELECT
-        <include refid="sqlColumns"/>
+        <include refid="sqlColumns"/>, cs.consult_id consultCode, CONVERT(AES_DECRYPT(f.nickname,'aideakey') USING UTF8) nickName
         FROM t_order o
+        LEFT JOIN t_aidea_consult_sheet cs ON o.consult_id = cs.id
         LEFT JOIN t_shipping_address s ON o.address_id = s.id
         LEFT JOIN t_order_details d ON o.id = d.order_id
         LEFT JOIN t_aidea_product t ON d.drugs_id = t.id
-        LEFT JOIN area a ON s.province_id = a.areaid
-        LEFT JOIN area b ON s.city_id = b.areaid
-        LEFT JOIN area c ON s.area_id = c.areaid
-        LEFT JOIN t_qyuser q ON o.service_id = q.id AND o.doctor_id = q.id
+        LEFT JOIN wx_mp_fanss f ON f.openid = o.openid
         <include refid="sqlWhere"/>
-        <if test="id!=null">and(o.service_id = ${id} or o.doctor_id =${id} or o.clerk_id = ${id})</if>
+        <if test="userid != null"> AND (o.service_id = ${userid} or o.doctor_id =${userid} or o.clerk_id = ${userid}) </if>
+        GROUP BY o.id
         <if test="sort!=null">ORDER BY ${sort.param} ${sort.type}</if>
         <if test="limit>0">limit #{offset},#{limit}</if>
     </select>
@@ -336,7 +342,7 @@
                 courier_number = #{courierNumber, jdbcType=VARCHAR},
             </if>
             <if test="confirm != null">
-                confirm = #{confirm, jdbcType=BIGINT},
+                confirm = #{confirm, jdbcType=VARCHAR},
             </if>
             <if test="remarks != null">
                 remarks = #{remarks, jdbcType=VARCHAR},
@@ -383,6 +389,9 @@
             <if test="clerkId != null">
                 clerk_id = #{clerkId, jdbcType=BIGINT},
             </if>
+            <if test="addressDes != null">
+                address_des = #{addressDes, jdbcType=VARCHAR}
+            </if>
         </set>
         where id=#{id,jdbcType=BIGINT}
     </update>
@@ -390,9 +399,11 @@
     <update id="delete" parameterType="java.lang.Long">
         update t_order set del_flag=1 where id=#{id,jdbcType=BIGINT}
     </update>
+
     <select id="fetchProduct" resultType="com.cftech.order.model.ProductDto" parameterType="java.util.Map">
        SELECT * FROM t_aidea_product WHERE  id = #{productId} AND accounts_id=#{accountsId} AND del_flag = 0
     </select>
+
     <update id="updateDetill" parameterType="java.util.Map">
         update t_order_details
         <set>
@@ -412,9 +423,11 @@
         </set>
         where order_id =#{id} and id = #{idDetail}
     </update>
+
     <select id="fetcheDeta" parameterType="java.util.Map" resultType="java.lang.Integer">
         select *  from t_order_details where order_id =#{id} and  accounts_id=#{accountsId} and drugs_id =#{productId}  and del_flag = 0
     </select>
+
     <insert id="saveDetill" parameterType="com.cftech.order.model.OrderDetailDto">
         insert into t_order_details
         (
@@ -434,6 +447,7 @@
         #{accountsId}
         )
     </insert>
+
     <select id="fetchOrder" resultType="com.cftech.order.model.Order" parameterType="java.lang.Long">
         select  * from t_order where id= #{id} and del_flag = 0
     </select>
@@ -447,11 +461,12 @@
         </set>
         where id= #{id}
     </update>
-    <update id="updateStatus" parameterType="java.lang.Long">
+
+    <update id="updateStatus" parameterType="java.util.Map">
         update t_order
         <set>
             <if test="id!=null">
-                status = 5
+                status = #{status}
             </if>
         </set>
         where id= #{id}
@@ -468,7 +483,7 @@
             t.courier_number AS courierNumber,
             t.order_cancel AS orderCancel,
             t.status,
-        t.create_time AS createTime,
+            DATE_FORMAT(t.create_time,'%Y-%m-%d %h:%i:%s')  AS createTime,
             s.address_name AS addressName,
             a.areaname AS province,
             b.areaname AS city,
@@ -476,20 +491,36 @@
             s.phone,
             s.address
         FROM
-        t_order t LEFT JOIN t_shipping_address s ON t.openid = s.open_id AND s.whether = 1
+          t_order t
+        LEFT JOIN t_order_details d  ON  t.id =d.order_id
+        LEFT JOIN t_aidea_product p  ON  d.drugs_id = p.id
+        LEFT JOIN t_shipping_address s ON t.address_id = s.id
         LEFT JOIN area a ON s.province_id = a.areaid
         LEFT JOIN area b ON s.city_id = b.areaid
         LEFT JOIN area c ON s.area_id = c.areaid
         WHERE t.del_flag=0
-        <if test="id !=null">
-            AND t.id =#{id}
-        </if>
-        <if test="openId !=null">
-            AND t.openid =#{openId}
-        </if>
-        <if test="status!=null ">
-            AND t.status =#{status}
-        </if>
+        <if test="id != null">
+            AND t.id = #{id}
+        </if>
+        <if test="openId != null">
+            AND t.openid = #{openId}
+        </if>
+        <if test="value != null and value != ''">
+            AND (t.number LIKE '%${value}%' OR p.product_name LIKE '%${value}%')
+        </if>
+        <choose>
+            <when test="status != null and status == 1 ">
+                AND (t.status = 0 OR t.status = 1)
+            </when>
+            <when test="status != null and status == 3 ">
+                AND (t.status = 2 OR t.status = 3)
+            </when>
+            <when test="status != null ">
+                AND t.status = #{status}
+            </when>
+            <otherwise></otherwise>
+        </choose>
+        GROUP BY t.id
         ORDER BY t.create_time DESC
     </select>
 
@@ -506,16 +537,17 @@
             and t.order_id =#{orderId}
         </if>
     </select>
+
     <select id="orderSize" resultType="com.cftech.order.model.OrderSizeVO" >
-SELECT
-SUM(status=0) AS confirm,
-SUM(status=2) AS delivered,
-SUM(status=3) AS received,
+        SELECT
+            SUM(status = 0 OR status = 1) AS waitPay,
+            SUM(status = 2 OR status = 3) AS waitExpress,
             SUM(status=4) AS completed,
             SUM(status=5) AS cancelled
-FROM t_order WHERE del_flag = 0
+        FROM t_order WHERE del_flag = 0 AND openid = #{openid}
 
     </select>
+
     <select id="orderList" resultType="com.cftech.order.model.OrderMobile" parameterType="com.cftech.order.model.OrderMobileDto">
         SELECT
         t.id,

aidea-modules/order-module/src/main/java/com/cftech/order/model/Order.java

@@ -46,8 +46,8 @@ public class Order extends OrderDetail implements Serializable {
     private String tradeNo;
     /* 顺丰运单号 */
     private String courierNumber;
-    /* 用户是否确认  0：待确认 1：已确认 2：取消 */
-    private Long confirm;
+    /* 订单开票编码 */
+    private String confirm;
     /* 订单取消原因 */
     @ExportConfig(value = "订单取消原因", width = 100, showLevel = 1)
     private String orderCancel;
@@ -65,6 +65,8 @@ public class Order extends OrderDetail implements Serializable {
     private Long consultId;
     /* 收货地址 */
     private Long addressId;
+    /* 收货地址详情 */
+    private String addressDes;
     /* 所属会员id */
     @ExportConfig(value = "所属会员id", width = 100, showLevel = 1)
     private Long memberId;
@@ -99,11 +101,38 @@ public class Order extends OrderDetail implements Serializable {
 
     private List<ProductVO> list;
 
+    /**
+     * 搜索字段
+     */
+    private String consultCode; /* 咨询单编码 */
+    private String productNameTmp;//产品名称
+    private String startOrderAmount;//订单开始金额
+    private String endOrderAmount;//订单结束金额
+    private String startPayAmount;//付款开始金额
+    private String endPayAmount;//付款结束金额
+    private String isBill;  /* 是否开票 0:是 1:否 */
+    private String orderStartTime;//订单开始时间
+    private String orderEndTime;//订单结束时间
+    private String nickName;//患者昵称
+
+
     public Order() {
         this.delFlag = false;
         this.status = "0";
     }
 
+    public void setProductName(String productName) {
+        this.productName = productName;
+    }
+
+    public String getProductName() {
+        if (list == null) {
+            return null;
+        }
+        List<String> collect = this.list.stream().map(x -> x.getProductName()).collect(Collectors.toList());
+        return StringUtils.join(collect, ";");
+    }
+
     @Override
     public Long getId() {
         return id;
@@ -114,14 +143,6 @@ public class Order extends OrderDetail implements Serializable {
         this.id = id;
     }
 
-    public Long getConsultId() {
-        return consultId;
-    }
-
-    public void setConsultId(Long consultId) {
-        this.consultId = consultId;
-    }
-
     public String getNumber() {
         return number;
     }
@@ -130,30 +151,6 @@ public class Order extends OrderDetail implements Serializable {
         this.number = number;
     }
 
-    public Long getMemberId() {
-        return memberId;
-    }
-
-    public void setMemberId(Long memberId) {
-        this.memberId = memberId;
-    }
-
-    public Long getServiceId() {
-        return serviceId;
-    }
-
-    public void setServiceId(Long serviceId) {
-        this.serviceId = serviceId;
-    }
-
-    public Long getDoctorId() {
-        return doctorId;
-    }
-
-    public void setDoctorId(Long doctorId) {
-        this.doctorId = doctorId;
-    }
-
     @Override
     public String getOpenid() {
         return openid;
@@ -212,12 +209,20 @@ public class Order extends OrderDetail implements Serializable {
         this.tradeNo = tradeNo;
     }
 
-    public String getRemarks() {
-        return remarks;
+    public String getCourierNumber() {
+        return courierNumber;
     }
 
-    public void setRemarks(String remarks) {
-        this.remarks = remarks;
+    public void setCourierNumber(String courierNumber) {
+        this.courierNumber = courierNumber;
+    }
+
+    public String getConfirm() {
+        return confirm;
+    }
+
+    public void setConfirm(String confirm) {
+        this.confirm = confirm;
     }
 
     public String getOrderCancel() {
@@ -228,6 +233,14 @@ public class Order extends OrderDetail implements Serializable {
         this.orderCancel = orderCancel;
     }
 
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
     @Override
     public Long getAccountsId() {
         return accountsId;
@@ -258,6 +271,62 @@ public class Order extends OrderDetail implements Serializable {
         this.status = status;
     }
 
+    public Long getConsultId() {
+        return consultId;
+    }
+
+    public void setConsultId(Long consultId) {
+        this.consultId = consultId;
+    }
+
+    public Long getAddressId() {
+        return addressId;
+    }
+
+    public void setAddressId(Long addressId) {
+        this.addressId = addressId;
+    }
+
+    public String getAddressDes() {
+        return addressDes;
+    }
+
+    public void setAddressDes(String addressDes) {
+        this.addressDes = addressDes;
+    }
+
+    public Long getMemberId() {
+        return memberId;
+    }
+
+    public void setMemberId(Long memberId) {
+        this.memberId = memberId;
+    }
+
+    public Long getServiceId() {
+        return serviceId;
+    }
+
+    public void setServiceId(Long serviceId) {
+        this.serviceId = serviceId;
+    }
+
+    public Long getDoctorId() {
+        return doctorId;
+    }
+
+    public void setDoctorId(Long doctorId) {
+        this.doctorId = doctorId;
+    }
+
+    public Long getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(Long clerkId) {
+        this.clerkId = clerkId;
+    }
+
     @Override
     public Date getCreateTime() {
         return createTime;
@@ -308,71 +377,115 @@ public class Order extends OrderDetail implements Serializable {
         this.updateBy = updateBy;
     }
 
-    public Long getConfirm() {
-        return confirm;
+    public String getProductNumber() {
+        return productNumber;
     }
 
-    public void setConfirm(Long confirm) {
-        this.confirm = confirm;
+    public void setProductNumber(String productNumber) {
+        this.productNumber = productNumber;
     }
 
-    public String getCourierNumber() {
-        return courierNumber;
+    public Long getProductId() {
+        return productId;
     }
 
-    public void setCourierNumber(String courierNumber) {
-        this.courierNumber = courierNumber;
+    public void setProductId(Long productId) {
+        this.productId = productId;
     }
 
-    public String getProductNumber() {
-        return productNumber;
+    public String getAddress() {
+        return address;
     }
 
-    public void setProductNumber(String productNumber) {
-        this.productNumber = productNumber;
+    public void setAddress(String address) {
+        this.address = address;
     }
 
-    public String getProductName() {
-        if (list == null) {
-            return null;
+    public List<ProductVO> getList() {
+        return list;
     }
-        List<String> collect = this.list.stream().map(x -> x.getProductName()).collect(Collectors.toList());
-        return StringUtils.join(collect, ";");
+
+    public void setList(List<ProductVO> list) {
+        this.list = list;
     }
 
-    public void setProductName(String productName) {
-        this.productName = productName;
+    public String getConsultCode() {
+        return consultCode;
     }
 
-    public Long getAddressId() {
-        return addressId;
+    public void setConsultCode(String consultCode) {
+        this.consultCode = consultCode;
     }
 
-    public void setAddressId(Long addressId) {
-        this.addressId = addressId;
+    public String getProductNameTmp() {
+        return productNameTmp;
     }
 
-    public Long getClerkId() {
-        return clerkId;
+    public void setProductNameTmp(String productNameTmp) {
+        this.productNameTmp = productNameTmp;
     }
 
-    public void setClerkId(Long clerkId) {
-        this.clerkId = clerkId;
+    public String getStartOrderAmount() {
+        return startOrderAmount;
     }
 
-    public List<ProductVO> getList() {
-        return list;
+    public void setStartOrderAmount(String startOrderAmount) {
+        this.startOrderAmount = startOrderAmount;
     }
 
-    public void setList(List<ProductVO> list) {
-        this.list = list;
+    public String getEndOrderAmount() {
+        return endOrderAmount;
     }
 
-    public String getAddress() {
-        return address;
+    public void setEndOrderAmount(String endOrderAmount) {
+        this.endOrderAmount = endOrderAmount;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
+    public String getStartPayAmount() {
+        return startPayAmount;
+    }
+
+    public void setStartPayAmount(String startPayAmount) {
+        this.startPayAmount = startPayAmount;
+    }
+
+    public String getEndPayAmount() {
+        return endPayAmount;
+    }
+
+    public void setEndPayAmount(String endPayAmount) {
+        this.endPayAmount = endPayAmount;
+    }
+
+    public String getIsBill() {
+        return isBill;
+    }
+
+    public void setIsBill(String isBill) {
+        this.isBill = isBill;
+    }
+
+    public String getOrderStartTime() {
+        return orderStartTime;
+    }
+
+    public void setOrderStartTime(String orderStartTime) {
+        this.orderStartTime = orderStartTime;
+    }
+
+    public String getOrderEndTime() {
+        return orderEndTime;
+    }
+
+    public void setOrderEndTime(String orderEndTime) {
+        this.orderEndTime = orderEndTime;
+    }
+
+    public String getNickName() {
+        return nickName;
+    }
+
+    public void setNickName(String nickName) {
+        this.nickName = nickName;
     }
 }
\ No newline at end of file

aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderMobileDto.java

@@ -9,13 +9,13 @@ import lombok.Data;
  */
 @Data
 public class OrderMobileDto {
+
+    private Long id;
+    private String appId;
     private String openId;
-  private  String search;
-  private  String searchName;
     private Long status;
+    private String value;
     private Long page;
     private Long pageSize;
-  private  Long id;
-  private  String appId;
 
 }

aidea-modules/order-module/src/main/java/com/cftech/order/model/OrderSizeVO.java

@@ -9,12 +9,11 @@ import lombok.Data;
  */
 @Data
 public class OrderSizeVO {
-    /*待确认数量*/
-    private  Long confirm;
-    /*待发货数量*/
-    private  Long delivered;
+
+    /*待付款数量*/
+    private  Long waitPay;
     /*待收货数量*/
-    private  Long received;
+    private  Long waitExpress;
     /*已完成数量*/
     private  Long completed;
     /*已取消数量*/

aidea-modules/order-module/src/main/java/com/cftech/order/service/OrderService.java

@@ -5,52 +5,67 @@ import com.cftech.core.sql.Conds;
 import com.cftech.core.sql.Sort;
 import com.cftech.order.model.*;
 import com.cftech.core.generic.GenericService;
-import com.qiniu.util.Json;
-import org.apache.ibatis.annotations.Param;
 
 import java.io.Serializable;
 import java.util.List;
 
 /**
-* 订单管理Service
-*
-* @author Licc
-* @date: 2020-10-10 14:20
-*/
+ * 订单管理Service
+ *
+ * @author Licc
+ * @date: 2020-10-10 14:20
+ */
 public interface OrderService extends GenericService<Order> {
 
+    /**
+     * 查询订单主列表
+     * @param conds
+     * @param sort
+     * @param page
+     * @param pageSize
+     * @param userid
+     * @return
+     */
+    List<Order> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize, Long userid);
 
-    List<Order> fetchSearchBy(Conds conds, Sort sort, int page, int pageSize , String id);
+    Integer count(Conds conds, Long userid);
 
     List<ProductOrder> listProduct();
+
     OrderFromVO fetchId(Serializable id);
+
     List<OrderFromVO> fetchProductId(Serializable id);
-    Integer updateStatus(Long id);
+
+    Integer updateStatus(Long id, String status);
+
     JSONObject newlyAdded(String datas, Long accountsId);
+
     JSONObject deleteAll(Long id);
+
     /**
+     * @return
      * @Author Licc
      * @Description 根据订单状态查询订单
      * @Date 15:45 2020/10/30
      * @Param
-     * @return 
      **/
     JSONObject confirm(OrderMobileDto orderMobileDto);
+
     /**
+     * @return
      * @Author Licc
      * @Description 订单数量
      * @Date 19:05 2020/11/3
      * @Param
-     * @return
      **/
-    JSONObject orderSize(String openId,String appId);
+    JSONObject orderSize(String openId, String appId);
 
     /**
+     * @return
      * @Author Licc
      * @Description 根据搜索条件查询订单
      * @Date 19:05 2020/11/3
      * @Param
-     * @return
      **/
     JSONObject orderList(OrderMobileDto orderMobileDto);
 

aidea-modules/order-module/src/main/java/com/cftech/order/web/MobileOrderController.java

@@ -37,13 +37,13 @@ public class MobileOrderController {
     /**
      * @return
      * @Author Licc
-     * @Description 订单数量
+     * @Description 个人中心订单统计
      * @Date 19:03 2020/11/3
      * @Param
      **/
     @RequestMapping(value = "/orderSize", method = {RequestMethod.POST}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
     public JSONObject orderSize(String openId,String appId) {
-        return orderService.orderSize(openId,appId);
+        return orderService.orderSize(openId, appId);
     }
 
     /**

aidea-modules/order-module/src/main/java/com/cftech/order/web/OrderController.java

@@ -14,7 +14,6 @@ import com.cftech.core.sql.Conds;
 import com.cftech.core.sql.Sort;
 import com.cftech.core.util.Constants;
 import com.cftech.order.utils.DoubleJSONFilter;
-import com.cftech.orderdetail.model.OrderDetails;
 import com.cftech.orderdetail.web.OrderDetailsController;
 import com.cftech.sys.security.UserUtils;
 import lombok.extern.slf4j.Slf4j;
@@ -24,7 +23,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.multipart.MultipartFile;
@@ -46,7 +44,7 @@ import java.util.List;
  * 查看:public static final String ORDER_EDIT = "qy:order:edit"
  *
  * @author Licc
- * @date: 2020-10-10 14:20
+ * @date: 2020-10-10 14:20 express
  */
 @Slf4j
 @Controller
@@ -126,22 +124,66 @@ public class OrderController {
     @RequestMapping(value = "/listData")
     @ResponseBody
     public JSONObject listData(int iDisplayStart, int iDisplayLength, Order order,  HttpServletRequest request) {
-        String id = String.valueOf(UserUtils.getUser().getId());
+        Long userid = UserUtils.getUser().getId();
         Long accountsId = UserUtils.getmpaccounts(request);
+
         Conds conds = new Conds();
         conds.equal("o.del_flag", Constants.DEL_FLAG_0);
-//        conds.equal("d.del_flag", Constants.DEL_FLAG_0);
         conds.equal("o.accounts_id", accountsId);
-        Sort sort = new Sort("o.create_time", OrderType.DESC);
-        if (!StringUtils.isEmpty(order.getNumber())) {
+        //咨询单编码
+        if (StringUtils.isNoneBlank(order.getConsultCode())) {
+            conds.like("cs.consult_id", order.getConsultCode());
+        }
+        //订单编码
+        if (StringUtils.isNoneBlank(order.getNumber())) {
             conds.like("o.number", order.getNumber());
         }
-        if (!StringUtils.isEmpty(order.getProductName())) {
-            conds.like("t.product_name", order.getProductName());
+        //产品名称
+        if (StringUtils.isNoneBlank(order.getProductNameTmp())) {
+            conds.like("t.product_name", order.getProductNameTmp());
+        }
+        //顺丰运单号
+        if (StringUtils.isNoneBlank(order.getCourierNumber())) {
+            conds.like("o.courier_number", order.getCourierNumber());
+        }
+        //订单开始金额
+        if (StringUtils.isNoneBlank(order.getStartOrderAmount())) {
+            conds.greatEqual("o.order_amount", order.getStartOrderAmount());
+        }
+        //订单结束金额
+        if (StringUtils.isNoneBlank(order.getEndOrderAmount())) {
+            conds.lessEqual("o.order_amount", order.getEndOrderAmount());
+        }
+        //最终开始金额
+        if (StringUtils.isNoneBlank(order.getStartPayAmount())) {
+            conds.greatEqual("o.total_amount", order.getStartPayAmount());
+        }
+        //最终结束金额
+        if (StringUtils.isNoneBlank(order.getEndPayAmount())) {
+            conds.lessEqual("o.total_amount", order.getEndPayAmount());
+        }
+        //订单状态
+        if (StringUtils.isNoneBlank(order.getStatus())) {
+            conds.equal("o.status", order.getStatus());
+        }
+        //是否开票
+        if (StringUtils.isNoneBlank(order.getIsBill()) && StringUtils.equals(order.getIsBill(), "1")) {//未开票
+            conds.isNull("o.confirm");
+        } else if (StringUtils.isNoneBlank(order.getIsBill()) && StringUtils.equals(order.getIsBill(), "0")) {//已开票
+            conds.notNull("o.confirm");
+        }
+        //订单开始时间
+        if (StringUtils.isNoneBlank(order.getOrderStartTime())) {
+            conds.greatEqual("DATE_FORMAT(o.create_time, '%Y-%m-%d')", order.getOrderStartTime());
+        }
+        //订单结束时间
+        if (StringUtils.isNoneBlank(order.getOrderEndTime())) {
+            conds.lessEqual("DATE_FORMAT(o.create_time, '%Y-%m-%d')", order.getOrderEndTime());
         }
 
-        List<Order> list = orderService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength, id);
-        Integer counts = orderService.count(conds);
+        Sort sort = new Sort("o.create_time", OrderType.DESC);
+        List<Order> list = orderService.fetchSearchBy(conds, sort, iDisplayStart, iDisplayLength, userid);
+        Integer counts = orderService.count(conds, userid);
         JSONObject rtnJson = new JSONObject();
         rtnJson.put("iTotalRecords", counts);
         rtnJson.put("iTotalDisplayRecords", counts);
@@ -184,11 +226,7 @@ public class OrderController {
             orderVO.setCourierNumber(order.getCourierNumber());
             orderVO.setTradeNo(order.getTradeNo());
             orderVO.setCreateTime(simpleDateFormat.format(order.getCreateTime()));
-            if (("").equals(order.getPayStatus()) && order.getPayStatus()==null){
-                orderVO.setPayStatus("");
-            }else {
-                orderVO.setPayStatus(("0").equals(order.getPayStatus()) ? "待确认" : ("1").equals(order.getPayStatus()) ? "待付款" : ("2").equals(order.getPayStatus()) ? "待发货" :("3").equals(order.getPayStatus()) ? "待收货":("4").equals(order.getPayStatus()) ? "已完成" :"已取消");
-            }
+            orderVO.setPayStatus(order.getPayStatus().equals("0") ? "待确认" : order.getPayStatus().equals("1") ? "待付款" : order.getPayStatus().equals("2") ? "待发货" :order.getPayStatus().equals("3") ? "待收货":order.getPayStatus().equals("4") ? "已完成" :"已取消");
             orderVOS.add(orderVO);
         }
         ExcelKit.$Export(OrderVO.class, response).toExcel(orderVOS, "订单管理信息");
@@ -245,9 +283,9 @@ public class OrderController {
     }
     @RequestMapping("/updateStatus")
     @ResponseBody
-    public JSONObject updateStatus(Long id,HttpServletRequest request ,Model model) {
+    public JSONObject updateStatus(Long id, String status, HttpServletRequest request) {
         JSONObject rtnJson = new JSONObject();
-        Integer integer = orderService.updateStatus(id);
+        Integer integer = orderService.updateStatus(id, status);
         if (integer>0){
             rtnJson.put("errorNo","0");
             return rtnJson;

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

@@ -102,7 +102,6 @@
                                     <td>序号</td>
                                     <td>分类级别</td>
                                     <td>上级分类</td>
-                                    <td>banner图</td>
                                     <td>是否推荐</td>
                                     <td>备注</td>
                                     <th>创建时间</th>
@@ -221,10 +220,6 @@
                 ,
                 {
                     "mData":"parentName"
-                }
-                ,
-                {
-                    "mData":"classifyImg"
                 },
                 {
                     "mData":"whetherRecommend"

behavior-modules/wx-qrcode-module-web/src/main/webapp/WEB-INF/views/wxQrcode/wxQrcodeform.html

@@ -237,30 +237,28 @@
     var columnUrl = "";
     //选择栏目
     $("#columnSelect").click(function () {
-        var Id= $("#typeselect").val()
-        if (Id=="3"){
+        var type = $("#typeselect").val();
+        if (type == "4") {
             columnUrl ="#springUrl('/a/wxQrcode/listOrg')"
-
-        }else{
-            columnUrl ="#springUrl('/a/wxQrcode/listUser?userId=" + Id + "')"
+        } else {
+            columnUrl ="#springUrl('/a/wxQrcode/listUser?type=" + type + "')"
         }
-
+        var title = type == "4" ? "人员名称" : "组织名称";
         Cfapp.f7({
             dataUrl: columnUrl,
             checkType: 'single', // 多选为multi
             title: "选择二维码绑定对象",
             btnoktext: "确定",
             btncanceltext: "取消",
-            columns: ['选择', '人员名称'],
+            columns: ['选择', title],
             isSearch: '0',
             searchColumns: ["name"],//搜索的字段名称
-            searchColumnsRemarks: ['人员名称'],//搜索的字段备注
+            searchColumnsRemarks: [title],//搜索的字段备注
             aoColumns: [{
                 "mData": "id"
             }, {
                 "mData": "name"
-            }
-            ],
+            }],
             aoColumnDefs: [{
                 "aTargets": [0],
                 "mData": "id",

behavior-modules/wx-qrcode-module-web/src/main/webapp/WEB-INF/views/wxQrcode/wxQrcodelist.html

@@ -235,7 +235,7 @@
             "sScrollY" : 400,
             sScrollX: "100%",
             bScrollCollapse: false,
-            sScrollXInner: "150%",
+            sScrollXInner: "100%",
             scrollCollapse: true,
             iDisplayLength: 20,
             "lengthChange": false,

behavior-modules/wx-qrcode-module/src/main/java/com/cftech/shop/qrcode/dao/WxQrcodeMapper.java

@@ -29,11 +29,11 @@ public interface WxQrcodeMapper extends GenericDao<WxQrcode> {
 
     List<WxQrcode> fetchSingleSearchInfo(Map<String, Object> params);
 
-    List<QyUser> fromUser(@Param("userId") int userId, @Param("name")String name);
+    List<QyUser> fromUser(@Param("type") int type, @Param("name")String name, @Param("page") int page, @Param("pageSize") int pageSize);
 
-    List<WxQrcode> fromOrg(@Param("name")String name);
+    int countUser(@Param("type") int type, @Param("name")String name);
 
+    List<WxQrcode> fromOrg(@Param("name")String name, @Param("page") int page, @Param("pageSize") int pageSize);
 
-    int countUser(int userId);
     int countOrg();
 }
\ No newline at end of file

behavior-modules/wx-qrcode-module/src/main/java/com/cftech/shop/qrcode/dao/WxQrcodeMapper.xml

@@ -243,14 +243,21 @@
     </select>
 
     <select id="fromUser" resultType="com.cftech.shop.qrcode.model.QyUser">
-        select id,name from t_qyuser where user_type=#{userId}  <if test=" name !=null and name != '' "> and  name like '%${name}%'</if>
+        select id, name from t_qyuser where user_type=#{type} <if test=" name !=null and name != '' "> and  name like '%${name}%'</if>
+        ORDER BY create_time DESC
+        <if test="pageSize>0">limit #{page}, #{pageSize}</if>
     </select>
+
+    <select id="countUser" resultType="java.lang.Integer">
+        select count(1) from t_qyuser where user_type=#{type} <if test=" name !=null and name != '' "> and  name like '%${name}%'</if>
+    </select>
+
     <select id="fromOrg" resultType="com.cftech.shop.qrcode.model.Orgunit">
         select id,org_name name from t_orgunit  <if test=" name !=null and name != '' ">  where  org_name like '%${name}%'</if>
+        ORDER BY create_time DESC
+        <if test="pageSize>0">limit #{page}, #{pageSize}</if>
     </select>
-    <select id="countUser" resultType="java.lang.Integer">
-        select count(1) from t_qyuser where user_type=#{userId}
-    </select>
+
     <select id="countOrg" resultType="java.lang.Integer">
         select count(1) from t_orgunit
     </select>

behavior-modules/wx-qrcode-module/src/main/java/com/cftech/shop/qrcode/service/WxQrcodeService.java

@@ -30,10 +30,11 @@ public interface WxQrcodeService extends GenericService<WxQrcode> {
 
     List<WxQrcode> fetchSingleSearchInfo(Conds conds, Sort sort, int page, int pageSize);
 
-    List<QyUser> fromUser(int userId,String name);
+    List<QyUser> fromUser(int type, String name, int iDisplayStart, int iDisplayLength);
 
-    List<WxQrcode> fromOrg(String name);
+    int countUser(int type, String name);
+
+    List<WxQrcode> fromOrg(String name, int iDisplayStart, int iDisplayLength);
 
-    int countUser(int userId);
     int countOrg();
 }

behavior-modules/wx-qrcode-module/src/main/java/com/cftech/shop/qrcode/service/impl/WxQrcodeServiceImpl.java

@@ -84,18 +84,22 @@ public class WxQrcodeServiceImpl extends GenericServiceImpl<WxQrcode> implements
     }
 
     @Override
-    public List<QyUser> fromUser(int userId,String name) {
-        return wxQrcodeMapper.fromUser(userId,name);
+    public List<QyUser> fromUser(int type, String name, int page, int pageSize) {
+        page = page > 0 ? page : 0;
+        pageSize = pageSize > 0 ? pageSize : 0;
+        return wxQrcodeMapper.fromUser(type, name, page, pageSize);
     }
 
     @Override
-    public List<WxQrcode> fromOrg(String name) {
-        return wxQrcodeMapper.fromOrg(name);
+    public int countUser(int type, String name) {
+        return wxQrcodeMapper.countUser(type, name);
     }
 
     @Override
-    public int countUser(int userId) {
-        return wxQrcodeMapper.countUser(userId);
+    public List<WxQrcode> fromOrg(String name, int page, int pageSize) {
+        page = page > 0 ? page : 0;
+        pageSize = pageSize > 0 ? pageSize : 0;
+        return wxQrcodeMapper.fromOrg(name, page, pageSize);
     }
 
     @Override

behavior-modules/wx-qrcode-module/src/main/java/com/cftech/shop/qrcode/web/WxQrcodeController.java

@@ -147,8 +147,6 @@ public class WxQrcodeController {
                 } else {
                     rtnJson.put("errorNo", 1);
                 }
-
-
             }
         } catch (Exception e) {
             rtnJson.put("errorNo", 1);
@@ -159,15 +157,14 @@ public class WxQrcodeController {
     //获取用户展示数据
     @RequestMapping(value = "/listUser")
     @ResponseBody
-    public JSONObject fromUser( int userId,String name) {
+    public JSONObject fromUser(int type, String name, int iDisplayStart, int iDisplayLength) {
         JSONObject rtnJson = new JSONObject();
-            if (!StringUtils.isEmpty(userId)) {
-                List<QyUser> qyUsers = wxQrcodeService.fromUser(userId,name);
-                int countUser = wxQrcodeService.countUser(userId);
+            if (!StringUtils.isEmpty(type)) {
+                List<QyUser> qyUsers = wxQrcodeService.fromUser(type, name, iDisplayStart, iDisplayLength);
+                int countUser = wxQrcodeService.countUser(type, name);
                 rtnJson.put("iTotalRecords", countUser);
                 rtnJson.put("iTotalDisplayRecords", countUser);
                 rtnJson.put("data", qyUsers);
-
             }
         return rtnJson;
     }
@@ -175,9 +172,9 @@ public class WxQrcodeController {
     //获取组织展示数据
     @RequestMapping(value = "/listOrg",method = {RequestMethod.GET})
     @ResponseBody
-    public JSONObject fromOrg(@RequestParam(required = false)String name) {
+    public JSONObject fromOrg(@RequestParam(required = false)String name, int iDisplayStart, int iDisplayLength) {
         JSONObject rtnJson = new JSONObject();
-        List<WxQrcode> wxQrcodes = wxQrcodeService.fromOrg(name);
+        List<WxQrcode> wxQrcodes = wxQrcodeService.fromOrg(name, iDisplayStart, iDisplayLength);
         int countOrg = wxQrcodeService.countOrg();
         rtnJson.put("iTotalRecords", countOrg);
         rtnJson.put("iTotalDisplayRecords", countOrg);
@@ -204,7 +201,6 @@ public class WxQrcodeController {
         }
 
         Sort sort = new Sort("t.create_time", OrderType.DESC);
-
         List<WxQrcodeVO> list = wxQrcodeService.fetchSearchByPageVO(conds, sort, iDisplayStart, iDisplayLength);
         Integer counts = wxQrcodeService.count(0L, conds);
         JSONObject rtnJson = new JSONObject();

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

@@ -16,7 +16,8 @@ CONSULT_SHEET_AUDIT_FAILED_TEMPLATE_MSG=77tLdRPQx1m8Gg0-t9HCGVOlka0G4ocFPdq8D5Uk
 ROOT_ORG_NAME=\u6C5F\u82CF\u827E\u8FEA\u836F\u4E1A
 AIDEA_QY_ACCOUNTS=349
 #\u4F01\u4E1A\u53F7\u53D1\u9001\u6D88\u606F\uFF0C\u57DF\u540D\u914D\u7F6E
-QY_DOMAIN_NAME=https://pd.shxrtech.com/adiea
+QY_DOMAIN_NAME=https://pd.shxrtech.com/aidea
+MOBILE_MP_DOMAIN_NAME=https://pd.shxrtech.com/aideas
 QY_DOMAIN=https://pd.shxrtech.com
 #\u4F01\u4E1A\u53F7\u63A8\u9001\u9ED8\u8BA4\u5E94\u7528id
 QY_SEND_APPID=350
@@ -25,8 +26,6 @@ QY_SEND_CUSTOMERSERVICE_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF
 #\u63A8\u9001\u836F\u5E08\u6D88\u606F\u5BA1\u6279\u54A8\u8BE2\u5355
 QY_SEND_DOCTOR_MSG=\u60A8\u6536\u5230\u4E00\u5F20\u54A8\u8BE2\u5355\uFF0C\u8BF7\u5BA1\u6279\uFF0C\u54A8\u8BE2\u5355\u7F16\u7801\uFF1A
 
-
-
 #\u56FE\u7247\u4E0A\u4F20\u5730\u5740
 #userfiles.imgdir=/mydata/fileResource
 userfiles.imgdir=/mydata/fileResource

cftech-common/src/main/java/com/cftech/core/util/IdcardUtils.java

+package com.cftech.core.util;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+/**
+ * Created by 16444 on 2020/11/20.
+ */
+public class IdcardUtils {
+
+    public static StringBuffer idcards = new StringBuffer();
+    public static List<String> idcardList = null;
+
+    static {
+        InputStream inputStream = null;
+        InputStreamReader inputStreamReader = null;
+        try {
+            inputStream = IdcardUtils.class.getClassLoader().getResourceAsStream("idcard.txt");
+            inputStreamReader = new InputStreamReader(inputStream, "UTF-8");
+            int len = 0;
+            while ((len = inputStreamReader.read()) != -1) {
+                idcards.append(len);
+            }
+            String str = idcards.toString();
+            String[] strArr = str.split(",");
+            idcardList = Arrays.asList(strArr);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            if (inputStreamReader != null) {
+                try {
+                    inputStreamReader.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+            if (inputStream != null) {
+                try {
+                    inputStream.close();
+                } catch (IOException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+    }
+
+}

membercard-modules/member-module/src/main/java/com/cftech/member/dao/MemberMapper.java

 package com.cftech.member.dao;
 
 import com.cftech.core.generic.GenericDao;
-import com.cftech.core.sql.Conds;
 import com.cftech.member.model.FanssVO;
 import com.cftech.member.model.Member;
 import com.cftech.member.model.MemberDto;
@@ -44,7 +43,7 @@ public interface MemberMapper extends GenericDao<Member> {
      * @Param
      * @return
      **/
-    List<MemberVO> memberFormation(Long id);
+    List<MemberVO> memberFormation(String openid);
 
     /**
      *

membercard-modules/member-module/src/main/java/com/cftech/member/dao/MemberMapper.xml

@@ -5,7 +5,6 @@
     <resultMap id="resultMap" type="com.cftech.member.model.Member">
         <id column="id" property="id"/>
         <result column="number" property="number"/>
-        <result column="surname" property="surname"/>
         <result column="name" property="name"/>
         <result column="phone" property="phone"/>
         <result column="imageurl" property="imageurl"/>
@@ -22,14 +21,15 @@
         <result column="update_by" property="updateBy"/>
         <result column="open_id" property="openId"/>
         <result column="storeid" property="storeid"/>
-        <result column="level" property="level"/>
-        <result column="area" property="area"/>
         <result column="fanss_store_id" property="fanssStoreId"/>
-        <result column="oilSum" property="oilSum"/>
+        <result column="sex" property="sex"/>
+        <result column="birthday" property="birthday"/>
+        <result column="area" property="area"/>
+        <result column="service_id" property="serviceId"/>
+        <result column="doctor_id" property="doctorId"/>
         <result column="invitcode" property="invitcode"/>
         <result column="compan" property="compan"/>
-        <result column="position" property="position"/>
-        <result column="service_id" property="serviceId"/>
+        <result column="source" property="source"/>
     </resultMap>
 
     <resultMap id="resultMapDto" type="com.cftech.member.model.MemberDto">
@@ -76,37 +76,6 @@
         </if>
     </sql>
 
-    <sql id="sqlColumns">
-                                    id,
-                                                number,
-                                                name,
-                                                phone,
-                                                imageurl,
-                                                cardid,
-                                                email,
-                                                member_id,
-                                                accounts_id,
-                                                del_flag,
-                                                status,
-                                                create_time,
-                                                update_time,
-                                                description,
-                                                create_by,
-                                                update_by,
-                                                open_id,
-                                                storeid,
-                                                birthday,
-                                                  sex,
-                                                position,
-                                                level,
-                                                area,
-                                                fanss_store_id,
-                                                oilSum,
-                                                invitcode,
-                                                compan,
-                                                service_id
-                        </sql>
-
     <sql id="sqlColumnslist">
         id,
         number,
@@ -126,17 +95,22 @@
         update_by,
         open_id,
         storeid,
-                                                 CONVERT( AES_DECRYPT(birthday,'aideakey') USING UTF8) birthday,
+        fanss_store_id,
         sex,
-                                                position,
-                                                level,
+        CONVERT( AES_DECRYPT(birthday,'aideakey') USING UTF8) birthday,
         area,
-                                                fanss_store_id,
-                                                oilSum,
+        service_id,
+        doctor_id,
         invitcode,
         compan,
-                                                service_id
+        source
+    </sql>
+
+    <sql id="sqlColumns">
+        id,number,name,phone,imageurl,cardid,email,member_id,accounts_id,del_flag,status,create_time,update_time,description,create_by,update_by,
+        open_id,storeid,fanss_store_id,sex,birthday,area,service_id,doctor_id,invitcode,compan,source
     </sql>
+
     <insert id="save" parameterType="com.cftech.member.model.Member" useGeneratedKeys="true"
             keyProperty="id">
         insert into wx_mp_member
@@ -148,7 +122,6 @@
             #{id, jdbcType=BIGINT},
             #{number, jdbcType=VARCHAR},
             AES_ENCRYPT(#{name, jdbcType=VARBINARY},'aideakey'),
-        #{surname},
             AES_ENCRYPT(#{phone, jdbcType=VARBINARY},'aideakey'),
             #{imageurl, jdbcType=VARCHAR},
             #{cardid, jdbcType=VARCHAR},
@@ -164,16 +137,13 @@
             #{updateBy, jdbcType=BIGINT},
             #{openId, jdbcType=VARCHAR},
             #{storeid,jdbcType=VARCHAR},
-        AES_ENCRYPT(#{birthday,jdbcType=VARBINARY},'aideakey'),
-        #{sex,jdbcType=VARCHAR},
-        #{position},
-        #{level,jdbcType=VARCHAR},
-        #{area,jdbcType=VARCHAR},
-        #{fanssStoreId,jdbcType=BIGINT},
+            #{fanssStoreId, jdbcType=BIGINT},
+            #{sex, jdbcType=BIGINT},AES_ENCRYPT(#{birthday,jdbcType=VARBINARY},'aideakey'),#{area,jdbcType=VARCHAR},
+            #{serviceId, jdbcType=VARCHAR},
             #{doctorId,jdbcType=VARCHAR},
             #{invitcode,jdbcType=VARCHAR},
             #{compan,jdbcType=VARCHAR},
-        #{serviceId, jdbc=VARCHAR}
+            #{source,jdbcType=BIGINT}
         )
     </insert>
 
@@ -199,7 +169,6 @@
             t.storeid,
             CONVERT(  AES_DECRYPT(offline.birthday,'aideakey') USING UTF8) offline.birthday,
             offline.sex,
-            t.level,
             t.area,
             t.fanss_store_id,t.doctor_id,
             t.invitcode,t.compan,
@@ -321,17 +290,11 @@
                 storeid = #{storeid, jdbcType=VARCHAR},
             </if>
             <if test="sex != null">
-                sex = #{sex, jdbcType=BINARY},
-            </if>
-            <if test="position!=null">
-                position = #{position},
+                sex = #{sex, jdbcType=BIGINT},
             </if>
             <if test="birthday != null">
                 birthday = AES_ENCRYPT(#{birthday, jdbcType=VARBINARY},'aideakey'),
             </if>
-            <if test="level != null">
-                level = #{level, jdbcType=VARCHAR},
-            </if>
             <if test="area != null">
                 area = #{area, jdbcType=VARCHAR},
             </if>
@@ -383,14 +346,15 @@
     </select>
     <!--个人信息回填
    -->
-    <select id="memberFormation" parameterType="java.lang.Long" resultType="com.cftech.member.model.MemberVO">
-       SELECT id,CONVERT(AES_DECRYPT(name,'aideakey') USING UTF8) AS memberName,sex,CONVERT(AES_DECRYPT(birthday,'aideakey')USING UTF8) birthday,imageurl,CONVERT(AES_DECRYPT(email,'aideakey')USING UTF8) AS mailbox,CONVERT(AES_DECRYPT(phone,'aideakey')USING UTF8) as phone
-       FROM  wx_mp_member WHERE id= #{id} and del_flag=0
+    <select id="memberFormation" parameterType="java.lang.String" resultType="com.cftech.member.model.MemberVO">
+       SELECT id,CONVERT(AES_DECRYPT(name,'aideakey') USING UTF8) AS memberName, sex, CONVERT(AES_DECRYPT(birthday,'aideakey')USING UTF8) birthday, imageurl,
+          CONVERT(AES_DECRYPT(email,'aideakey')USING UTF8) AS mailbox, CONVERT(AES_DECRYPT(phone,'aideakey')USING UTF8) as phone, cardid
+       FROM  wx_mp_member WHERE open_id = #{openid} and del_flag=0
     </select>
-    <select id="fanssChat" resultType="com.cftech.member.model.FanssVO">
-SELECT openid,CONVERT(AES_DECRYPT(nickname,'aideakey') USING UTF8) nickname,headimgurl
-FROM  wx_mp_fanss WHERE openid = #{openid} and delflag=0
 
+    <select id="fanssChat" resultType="com.cftech.member.model.FanssVO">
+        SELECT openid,CONVERT(AES_DECRYPT(nickname,'aideakey') USING UTF8) nickname,headimgurl
+        FROM  wx_mp_fanss WHERE openid = #{openid} and delflag=0
     </select>
     <!--个人信息修改
     -->
@@ -413,7 +377,13 @@ FROM  wx_mp_fanss WHERE openid = #{openid} and delflag=0
                 phone = AES_ENCRYPT(#{phone},'aideakey'),
             </if>
             <if test="imageUrl !=null">
-                imageurl = #{imageUrl}
+                imageurl = #{imageUrl},
+            </if>
+            <if test="cardid != null ">
+                cardid = #{cardid}
+            </if>
+            <if test="compan != null ">
+                compan = #{compan}
             </if>
         </set>
         where id =#{id}

membercard-modules/member-module/src/main/java/com/cftech/member/model/Member.java

@@ -19,7 +19,7 @@ public class Member implements Serializable {
 
     public static void main(String[] args) throws WexinReqException {
         Cosconfig cosconfig = new Cosconfig();
-        net.sf.json.JSONObject mediaJson= JwMediaAPI.downMedia("12_r_qzTWhvOUsmjGtRKE7bXsat2Ih10K-L9kZJoj74mZRGu3ZOYfHJzENBgSHQBDGNhCfE7Vnl3bfTuS-zh2h3MF7C6H3XErVzfOnVBBsgreAA-dqVxBmsmK4B6CJfbJDonAp9x2vvBvEcepBqVRHhAHAGCS","jwjOUMFA_llgdAP_MBMarxIHu3YozRfHdC5Cdo_koujuoRfxUSNab4u8RLoFBdjL","",cosconfig);
+        net.sf.json.JSONObject mediaJson = JwMediaAPI.downMedia("12_r_qzTWhvOUsmjGtRKE7bXsat2Ih10K-L9kZJoj74mZRGu3ZOYfHJzENBgSHQBDGNhCfE7Vnl3bfTuS-zh2h3MF7C6H3XErVzfOnVBBsgreAA-dqVxBmsmK4B6CJfbJDonAp9x2vvBvEcepBqVRHhAHAGCS", "jwjOUMFA_llgdAP_MBMarxIHu3YozRfHdC5Cdo_koujuoRfxUSNab4u8RLoFBdjL", "", cosconfig);
     }
 
     /* 主键id */
@@ -29,10 +29,8 @@ public class Member implements Serializable {
     /* 姓名 */
     @ExportConfig(value = "名", width = 100)
     private String name;
-    @ExportConfig(value = "姓",width = 100)
-    private String surname;
     /* 手机号 */
-    @ExportConfig(value = "手机号码" , width = 100)
+    @ExportConfig(value = "手机号码", width = 100)
     private String phone;
     /* 头像 */
     @ExportConfig(value = "头像", width = 100)
@@ -41,6 +39,10 @@ public class Member implements Serializable {
     //@ExportConfig(value = "身份证", width = 100)
     private String cardid;
 
+    /* 其他信息 */
+    @ExportConfig(value = "Email", width = 100)
+    private String email;
+
     /* 会员卡号 */
     //@ExportConfig(value = "会员卡号", width = 100)
     private String memberId;
@@ -65,65 +67,41 @@ public class Member implements Serializable {
     //@ExportConfig(value = "openId", width = 100)
     private String openId;
 
-    private String position;
-
     /**
-     * 辅助字段
+     * 绑定的门店
      */
-    /*生日*/
-    private String birthday;
-
-    /*性别*/
-    @ExportConfig(value = "性别", width = 100)
-    private String sex;
-
-    /**会员等级*/
-    private String level;
-
-    /**地区*/
-    private String area;
-
-    /* 其他信息 */
-    @ExportConfig(value = "Email", width = 100)
-    private String email;
-
-    /**绑定的门店*/
     private String storeid;
 
     /**
-     *注册时从粉丝表取的门店ID
-     * */
+     * 注册时从粉丝表取的门店ID
+     */
     private Long fanssStoreId;
 
+    /*性别*/
+    @ExportConfig(value = "性别", width = 100)
+    private Long sex;
 
-
+    private String position;
 
     /**
-     *会员卡名字
+     * 辅助字段
      */
-    private String memberName;
+    /*生日*/
+    private String birthday;
 
     /**
-     *会员卡手机号
+     * 会员等级
      */
-    private String memberPhone;
+    private String level;
 
     /**
-     * 会员卡所绑定门店
-     */
-    private String memberStoreId;
-    /**
-     * 会员邀请码
+     * 地区
      */
-    private String invitcode;
-
-
-    private String compan;
+    private String area;
 
     /**
      * 所属客服id
      */
-    //private String member_uid;
     private String serviceId;
 
     /**
@@ -132,6 +110,16 @@ public class Member implements Serializable {
     //private String oilSum;
     private String doctorId;
 
+    /**
+     * 会员邀请码
+     */
+    private String invitcode;
+
+    /**
+     * 是否三期患者
+     */
+    private String compan;
+
     /**
      * 会员来源： 1:普通关注 2：医师二维码 3：客服二维码 4：医生二维码 5：组织二维码
      */
@@ -140,7 +128,20 @@ public class Member implements Serializable {
 
 
 
+    /**
+     * 会员卡名字
+     */
+    private String memberName;
 
+    /**
+     * 会员卡手机号
+     */
+    private String memberPhone;
+
+    /**
+     * 会员卡所绑定门店
+     */
+    private String memberStoreId;
 
 
     public Member() {

membercard-modules/member-module/src/main/java/com/cftech/member/model/MemberVO.java

@@ -13,13 +13,15 @@ import java.util.Date;
  */
 @Data
 public class MemberVO {
+
     /*appid*/
     private  String appId;
+
     private  Long id;
     /*姓名*/
     private  String memberName;
     /*性别*/
-    private  Long sex;
+    private  String sex;
     /*生日*/
     @DateTimeFormat(pattern = "yyyy-MM-dd")
     private Date birthday;
@@ -35,4 +37,13 @@ public class MemberVO {
     private Long accountsID;
 
     private String birthdayStr;
+
+    private String cardid;
+
+    /**
+     * 会员编码
+     */
+    private String number;
+
+    private String compan;
 }

membercard-modules/member-module/src/main/java/com/cftech/member/service/MemberService.java

@@ -52,7 +52,7 @@ public interface MemberService extends GenericService<Member> {
      * @Param
      * @return
      **/
-    JSONObject memberFormation(Long id,String appId);
+    JSONObject memberFormation(String openid, String appId);
 
     /**
      * 个人信息修改

membercard-modules/member-module/src/main/java/com/cftech/member/service/impl/MemberServiceImpl.java

@@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.cftech.accounts.model.MpAccountsEntity;
 import com.cftech.accounts.service.MpAccountsService;
+import com.cftech.base.codingrule.utils.CodingruleUtils;
 import com.cftech.core.generic.GenericDao;
 import com.cftech.core.generic.GenericServiceImpl;
 import com.cftech.core.scope.OrderType;
@@ -11,6 +12,7 @@ import com.cftech.core.sql.Cond;
 import com.cftech.core.sql.Conds;
 import com.cftech.core.sql.Sort;
 import com.cftech.core.util.DateFormatUtils;
+import com.cftech.core.util.IdcardUtils;
 import com.cftech.core.util.StringUtils;
 import com.cftech.member.dao.MemberMapper;
 import com.cftech.member.model.FanssVO;
@@ -18,6 +20,8 @@ import com.cftech.member.model.Member;
 import com.cftech.member.model.MemberDto;
 import com.cftech.member.model.MemberVO;
 import com.cftech.member.service.MemberService;
+import com.cftech.mp.fans.model.MpFanssEntity;
+import com.cftech.mp.fans.service.MpFanssService;
 import com.cftech.workshop.meeting.model.Meeting;
 import com.cftech.workshop.workshop.model.Workshop;
 import com.cftech.workshop.workshop.service.WorkshopService;
@@ -43,11 +47,19 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem
     @Autowired
     @Qualifier("memberMapper")
     private MemberMapper memberMapper;
+
     @Autowired
     private MpAccountsService mpAccountsService;
+
     @Autowired
     private WorkshopService workshopService;
 
+    @Autowired
+    private MpFanssService fanssService;
+
+    @Autowired
+    private CodingruleUtils codingruleUtils;
+
     @Override
     public GenericDao<Member> getGenericMapper() {
         return memberMapper;
@@ -90,20 +102,30 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem
     }
 
     @Override
-    public JSONObject memberFormation(Long id, String appId) {
+    public JSONObject memberFormation(String openid, String appId) {
         JSONObject rtnJson = new JSONObject();
         try {
-            if (org.springframework.util.StringUtils.isEmpty(id)) {
+            if (org.springframework.util.StringUtils.isEmpty(openid)) {
                 rtnJson.put("errorNo", "1");
                 rtnJson.put("errorMsg", "id不能为空");
                 return rtnJson;
             }
             MpAccountsEntity accountsAppid = mpAccountsService.getMpAccountsAppid(appId);
-            List<MemberVO> memberVOS = memberMapper.memberFormation(id);
-            Log.info("返回值" + memberVOS);
+            //未注册会员时，填充粉丝信息
+            List<MemberVO> memberVOS = memberMapper.memberFormation(openid);
+            if (memberVOS == null || memberVOS.size() == 0) {
+                MpFanssEntity fanssEntity = fanssService.getWxUser(openid);
+                MemberVO member = new MemberVO();
+                member.setOpenid(openid);
+                member.setMemberName(fanssEntity.getNickname());
+                member.setSex(fanssEntity.getSex());
+                member.setImageUrl(fanssEntity.getHeadimgurl());
                 rtnJson.put("errorNo", "0");
-            rtnJson.put("data", memberVOS);
-
+                rtnJson.put("data", member);
+            } else {
+                rtnJson.put("errorNo", "0");
+                rtnJson.put("data", memberVOS.get(0));
+            }
         } catch (Exception e) {
             e.printStackTrace();
             rtnJson.put("errorNo", "1");
@@ -115,16 +137,14 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem
     public JSONObject updateMember(MemberVO memberVO) {
         JSONObject rtnJson = new JSONObject();
         try {
-            Date birthday = DateFormatUtils.formatDate(memberVO.getBirthdayStr(), "yyyy-MM-dd");
-            memberVO.setBirthday(birthday);
             if (StringUtils.isEmpty(memberVO.getMemberName())) {
                 rtnJson.put("errorNo", "1");
                 rtnJson.put("errorMsg", "姓名不能为空");
                 return rtnJson;
             }
-            if (StringUtils.isEmpty(memberVO.getMailbox())) {
+            if (StringUtils.isEmpty(memberVO.getCardid())) {
                 rtnJson.put("errorNo", "1");
-                rtnJson.put("errorMsg", "邮箱不能为空");
+                rtnJson.put("errorMsg", "身份证不能为空");
                 return rtnJson;
             }
             if (StringUtils.isEmpty(memberVO.getPhone())) {
@@ -132,8 +152,37 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem
                 rtnJson.put("errorMsg", "联系方式不能为空");
                 return rtnJson;
             }
-            MpAccountsEntity accountsAppid = mpAccountsService.getMpAccountsAppid(memberVO.getAppId());
-            int i = memberMapper.updateMember(memberVO);
+
+            int i = 0;
+            MpAccountsEntity accounts= mpAccountsService.getMpAccountsAppid(memberVO.getAppId());
+            List<MemberVO> memberVOS = memberMapper.memberFormation(memberVO.getOpenid());
+            if (memberVOS == null || memberVOS.size() == 0) {
+                Member member = new Member();
+                member.setOpenId(memberVO.getOpenid());
+                member.setName(memberVO.getMemberName());
+                member.setSex(Long.parseLong(memberVO.getSex()));
+                if (StringUtils.isNoneBlank(memberVO.getCardid())) {
+                    //三期患者
+                    if (IdcardUtils.idcardList.contains(memberVO.getCardid())) {
+                        member.setCompan("0");//三期患者
+                    }
+                }
+                member.setCardid(memberVO.getCardid());
+                member.setPhone(memberVO.getPhone());
+                member.setImageurl(memberVO.getImageUrl());
+
+                memberMapper.save(member);
+            } else {
+                memberVO.setNumber(codingruleUtils.getNumber(accounts.getId(), Member.class.getName()));
+                if (StringUtils.isNoneBlank(memberVO.getCardid())) {
+                    //三期患者
+                    if (IdcardUtils.idcardList.contains(memberVO.getCardid())) {
+                        memberVO.setCompan("0");//三期患者
+                    }
+                }
+                i = memberMapper.updateMember(memberVO);
+            }
+
             if (i > 0) {
                 rtnJson.put("errorNo", "0");
                 rtnJson.put("errorMsg", "修改成功");
@@ -183,7 +232,7 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem
             List<Workshop> list1 = workshopService.selectworkshop(conds1, sort1, 0, 0);
             if (list1 != null && list1.size() > 0) {
                 Workshop workshop = list1.get(0);
-                if (member.getSurname().equals(workshop.getSurname()) && member.getName().equals(workshop.getFirst_name()) && member.getPhone().equals("")) {
+                if ( member.getName().equals(workshop.getFirst_name()) && member.getPhone().equals("")) {
                     member.setPhone(workshop.getPhone());
                     memberMapper.save(member); //注册成功会员表里面添加一条数据
                 } else {

membercard-modules/member-module/src/main/java/com/cftech/member/web/MemberController.java

@@ -229,7 +229,6 @@ public class MemberController {
                     //member.setOilSum("0");
                     member.setNumber(codingruleUtils.getNumber(accountsId, Member.class.getName()));
                     //member.setMember_uid(UUID.randomUUID().toString());
-                    member.setSurname(workshop.getSurname());
                     member.setName(workshop.getFirst_name());
                     member.setPhone(workshop.getPhone());
                     member.setPosition(workshop.getPosition());

membercard-modules/member-module/src/main/java/com/cftech/member/web/MobileMemberController.java

@@ -30,8 +30,8 @@ public class MobileMemberController {
      * @Param
      **/
     @RequestMapping(value = "/memberFormation", method = {RequestMethod.GET, RequestMethod.POST}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-    public JSONObject memberFormation(Long id,String appId) {
-        return memberService.memberFormation(id,appId);
+    public JSONObject memberFormation(String openid, String appId) {
+        return memberService.memberFormation(openid, appId);
     }
 
     /**

mp-modules/mp-fanss-module-web/src/main/webapp/WEB-INF/views/managefans/fansslist.html

@@ -553,7 +553,7 @@
                         if (a == 0) {
                             return "普通关注";
                         } else if (a == 1) {
-                            return "药师师二维码";
+                            return "药师二维码";
                         } else if (a == 2) {
                             return "客服二维码";
                         } else if (a == 3) {

mp-modules/mp-fanss-module-web/src/main/webapp/WEB-INF/views/managefans/test.html

-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <title>Title</title>
-</head>
-<body>
-
-</body>
-<script>
-
-    var test = localStorage.getItem("test");
-    if(test && test!=null){
-        alert("已经有缓存"+test);
-    }else{
-        var test = localStorage.setItem("test","123");
-        alert("没有缓存，已插入新缓存"+test);
-    }
-</script>
-</html>
\ No newline at end of file

mp-modules/mp-fanss-module/src/main/java/com/cftech/mp/fans/dao/MpFanssMapper.xml

@@ -5,7 +5,7 @@
         <id column="id" property="id" jdbcType="BIGINT"/>
         <result column="openid" property="openid" jdbcType="VARCHAR"/>
         <result column="nickname" property="nickname" jdbcType="VARCHAR"/>
-        <result column="sex" property="sex" jdbcType="CHAR"/>
+        <result column="sex" property="sex" />
         <result column="city" property="city" jdbcType="VARCHAR"/>
         <result column="province" property="province" jdbcType="VARCHAR"/>
         <result column="country" property="country" jdbcType="VARCHAR"/>
@@ -215,7 +215,7 @@
 
     <!-- 根据openid获取用户详情 -->
     <select id="getWxUser" parameterType="java.lang.String" resultType="com.cftech.mp.fans.model.MpFanssEntity">
-        select * from wx_mp_fanss
+        select  <include refid="Base_Column_List"/> from wx_mp_fanss
         <where>
             openid=#{openid,jdbcType=VARCHAR} and delflag=0
         </where>

mp-modules/mp-fanss-module/src/main/java/com/cftech/mp/fans/service/MpFanssService.java

@@ -29,7 +29,7 @@ public interface MpFanssService extends GenericService<MpFanssEntity> {
 
 	Long selectFannscounts(@Param("userid") Long userid);
 
-	// 获取公众号下面所有关注者的粉丝appid
+
 	MpFanssEntity getWxUser(String openid);
 
 	// 根据公众号ID更新获取详细信息

mp-modules/mp-menu-module/src/main/java/com/cftech/mp/wechat/web/MpMenuController.java

@@ -218,7 +218,7 @@ public class MpMenuController {
 	}
 	
 	@RequestMapping(value="/remove",method={RequestMethod.POST})
-	@RequiresPermissions(value=PermissionSign.REPLY_EDIT)
+	//@RequiresPermissions(value=PermissionSign.MPMENU_EDIT)
 	@ResponseBody
 	public JSONObject removereply(Long id){
 		JSONObject rtnJson = new JSONObject();

mp-modules/mp-message-module/src/main/java/com/cftech/mp/reply/service/CoreService.java

@@ -235,16 +235,16 @@ public class CoreService {
             conds.equal("delflag", 0);
             conds.equal("accountsid", mpAccountEntity.getId());
             conds.equal("send_type", "subscribe");
-//            Reply reply = replyService.fetchSearchByConds(conds);
-//            if (reply != null) {
-//                if (reply.getReplyType().equals("text")) {//回复文本
-//                    return MessageUtil.textMessageToXml(text(fromUserName, toUserName, reply.getContentSource()));
-//                } else if (reply.getReplyType().equals("news")) {//回复微信图文
-//                    return MessageUtil.newsMessageToXml(news(fromUserName, toUserName, reply.getContentSource()));
-//                } else if (reply.getReplyType().equals("article")) {//回复文章
-//                    return MessageUtil.newsMessageToXml(localNews(fromUserName, toUserName, reply.getContentSource()));
-//                }
-//            }
+            Reply reply = replyService.fetchSearchByConds(conds);
+            if (reply != null) {
+                if (reply.getReplyType().equals("text")) {//回复文本
+                    return MessageUtil.textMessageToXml(text(fromUserName, toUserName, reply.getContentSource()));
+                } else if (reply.getReplyType().equals("news")) {//回复微信图文
+                    return MessageUtil.newsMessageToXml(news(fromUserName, toUserName, reply.getContentSource()));
+                } else if (reply.getReplyType().equals("article")) {//回复文章
+                    return MessageUtil.newsMessageToXml(localNews(fromUserName, toUserName, reply.getContentSource()));
+                }
+            }
         } else if (replyType.equals("keyword")) {
 //            List<Reply> replyList = replyService.fetchkeywordByPage(content, mpAccountEntity.getId(), "keyword");
 //            if (replyList != null && replyList.size() > 0) {
@@ -532,8 +532,9 @@ public class CoreService {
             article.setPicUrl(cover);
             article.setUrl(qyDomain + "/aidea/static/mp/aidea/wx-brand-agreement.html?appid=" + appid);
             return MessageUtil.newsMessageToXml(newsinfo(fromUserName, toUserName, article));
+        } else {
+            return replyMessage(fromUserName, toUserName, null, "subscribe");
         }
-        return null;
     }
 
 

mp-modules/mp-message-module/src/main/java/com/cftech/mp/reply/web/MobileWechatController.java

 package com.cftech.mp.reply.web;
 
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONObject;
+
 import com.cftech.accounts.model.MpAccountsEntity;
 import com.cftech.accounts.service.MpAccountsService;
-import com.cftech.core.sql.Conds;
+
 import com.cftech.core.util.MpTokenUtil;
-import com.cftech.core.util.StringUtils;
-import com.cftech.core.util.SystemConfig;
-import com.cftech.mp.fans.service.MpFanssService;
+
 import com.cftech.mp.reply.service.CoreService;
 import com.cftech.mp.reply.service.ReplyService;
-import com.google.gson.Gson;
+
 import org.mp.api.core.common.util.MessageUtil;
 import org.mp.api.core.common.util.SignUtil;
-import org.mp.api.core.req.model.message.IndustryTemplateMessageSend;
-import org.mp.api.core.req.model.message.TemplateData;
-import org.mp.api.wxsendmsg.JwSendMessageAPI;
-import org.mp.api.wxsendmsg.JwTemplateMessageAPI;
-import org.mp.api.wxsendmsg.test.JwSendMessageAPITest;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.ResponseBody;
 
 import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;

qy-modules/qy-orgunit-module-web/src/main/webapp/WEB-INF/views/managerqyuser/qyuseradd.html

@@ -144,11 +144,11 @@
                                 <div class="form-group form-md-line-input col-md-4">
                                     <label>职业</label>
                                     <select name="userType" class="form-control pull-right">
-                                        <option label="其他" value="4">其他</option>
-                                        <option label="订单员" value="3" #if($data.userType == '3') selected #end>订单员</option>
-                                        <option label="医生" value="2" #if($data.userType == '2') selected #end>医生</option>
+                                        <option label="其他" value="0">其他</option>
                                         <option label="药师" value="1" #if($data.userType == '1') selected #end>药师</option>
-                                        <option label="客服" value="0" #if($data.userType == '0') selected #end>客服</option>
+                                        <option label="客服" value="2" #if($data.userType == '2') selected #end>客服</option>
+                                        <option label="医生" value="3" #if($data.userType == '3') selected #end>医生</option>
+                                        <option label="订单员" value="4" #if($data.userType == '4') selected #end>订单员</option>
                                     </select>
                                 </div>
                                 <!--<div class="form-group form-md-line-input col-md-4">-->

qy-modules/qy-orgunit-module-web/src/main/webapp/WEB-INF/views/managerqyuser/qyuserlist.html

@@ -349,19 +349,19 @@
                     let postion = null;
                     switch (a) {
                         case "0":
-                            postion = "客服";
+                            postion = "其他";
                             break;
                         case "1":
                             postion = "药师";
                             break;
                         case "2":
-                            postion = "医生";
+                            postion = "客服";
                             break;
                         case "3":
-                            postion = "订单员";
+                            postion = "医生";
                             break;
                         case "4":
-                            postion = "其他";
+                            postion = "订单员";
                             break;
                     }
                     return "<font color='blue'>" +postion + "</font>";

qy-modules/qy-orgunit-module/src/main/java/com/cftech/base/org/web/QyuserController.java

@@ -364,19 +364,19 @@ public class QyuserController {
             String position = o.getUserType();
             switch (position) {
                 case "0":
-                    o.setUserType("客服");
+                    o.setUserType("其他");
                     break;
                 case "1":
                     o.setUserType("药师");
                     break;
                 case "2":
-                    o.setUserType("医生");
+                    o.setUserType("客服");
                     break;
                 case "3":
-                    o.setUserType("订单员");
+                    o.setUserType("医生");
                     break;
                 case "4":
-                    o.setUserType("其他");
+                    o.setUserType("订单员");
                     break;
             }
         });

wx-mobile-modules/src/main/webapp/static/mp/schaeffler/oauth2.html

@@ -24,7 +24,7 @@ $().ready(function () {
 function validate(){
 	if (code != null && code != "") { //有code已授权
 		window.location.href=redirect_uri+"&code="+code;
-	}else{//无Code调用微信授权
+	} else {//无Code调用微信授权
 		oauth2();
 	}
 }