Aidea product update by Strive Date 2020-10-30

aidea-modules/consult-module-web/src/main/webapp/WEB-INF/views/consultSheet/consultSheetform.html

@@ -71,7 +71,7 @@
                             <!--</div>-->
                             <div class="form-group">
                                 <label for="message-text" class="col-form-label">请输入拒绝原由:</label>
-                                <textarea class="form-control" rows="3" id="message-text"></textarea>
+                                <textarea class="form-control" rows="3" id="js-textarea"></textarea>
                             </div>
                         </form>
                     </div>
@@ -325,7 +325,6 @@
             $("#sex").val("男");
         }
         var status = $("#status").val();
-        console.log("status:", status)
         if (status == 0) {
             $("#status").val("未审核");
         } else if (status == 1) {
@@ -360,12 +359,20 @@
     }
     function review() {
         var url = "#springUrl('/a/consultSheet/updateData')";
-
-        var descriptionAdd = $("#message-text").text();
+        var reason = $("#js-textarea").val();
+        console.log(reason);
+        if (!reason || reason == null) {
+            Cfapp.alert({
+                message: "请输入拒绝原由!",
+                btntext: "确定",
+                success: function () {}
+            });
+            return;
+        }
         var aadata = {
             consultId: consultid,
             status: "2",
-            description: descriptionAdd
+            description: reason
         };
         $.ajax({
             url: url,

aidea-modules/consult-module/pom.xml

@@ -27,5 +27,10 @@
             <artifactId>member-module</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>com.cftech</groupId>
+            <artifactId>shipping-address-module</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file

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

@@ -12,7 +12,7 @@
         <result column="past_records" property="pastRecords"/>
         <result column="prescription" property="prescription"/>
         <result column="doctor_id" property="doctorId"/>
-        <result column="customer_id" property="customerId"/>
+        <result column="service_id" property="serviceId"/>
         <result column="illness" property="illness"/>
         <result column="accounts_id" property="accountsId"/>
         <result column="del_flag" property="delFlag"/>
@@ -68,7 +68,7 @@
         a.past_records,
         a.prescription,
         a.doctor_id,
-        a.customer_id,
+        a.service_id,
         a.illness,
         a.accounts_id,
         a.del_flag,
@@ -103,7 +103,7 @@
             past_records,
             prescription,
             doctor_id,
-            customer_id,
+            service_id,
             illness,
             accounts_id,
             del_flag,
@@ -132,7 +132,7 @@
             #{pastRecords, jdbcType=VARCHAR},
             #{prescription, jdbcType=VARCHAR},
             #{doctorId, jdbcType=BIGINT},
-            #{customerId, jdbcType=BIGINT},
+            #{serviceId, jdbcType=BIGINT},
             #{illness, jdbcType=BIGINT},
             #{accountsId, jdbcType=BIGINT},
             #{delFlag, jdbcType=TINYINT},
@@ -213,8 +213,8 @@
             <if test="doctorId != null">
                 doctor_id = #{doctorId, jdbcType=BIGINT},
             </if>
-            <if test="customerId != null">
-                customer_id = #{customerId, jdbcType=BIGINT},
+            <if test="serviceId != null">
+                service_id = #{serviceId, jdbcType=BIGINT},
             </if>
             <if test="illness != null">
                 illness = #{illness, jdbcType=BIGINT},

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

@@ -51,7 +51,7 @@ public class ConsultSheet extends UserSheet implements Serializable {
     /* 药师id */
     private Long doctorId;
     /* 客服id */
-    private Long customerId;
+    private Long serviceId;
     /* 本次确认症状 */
     private String symptom;
     /*是否已在医院确诊*/

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

@@ -121,13 +121,13 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
             memberConds.equal("open_id", openid);
             Member member = memberService.fetchSearchByConds(conds);
 
-            String customerId = member.getCustomerId();
+            String serviceId = member.getServiceId();
             Conds userConds = new Conds();
             userConds.equal("t.del_flag", Constants.DEL_FLAG_0);
-            userConds.equal("t.id", customerId);
+            userConds.equal("t.id", serviceId);
             Qyuser user = qyuserService.fetchSearchByConds(userConds);
             if (user.getPeakVal() > 0) {//客服峰值大于0
-                consultSheet.setCustomerId(user.getId());
+                consultSheet.setServiceId(user.getId());
             } else {//普通轮询
                 firstCustomerProcess(consultSheet);
             }
@@ -160,12 +160,12 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
         Sort sort = new Sort("t.assigned", OrderType.ASC);
         List<Qyuser> users = qyuserService.fetchSearchByPage(conds, sort, 0, 0);
         if (users.size() == 1) {
-            consultSheet.setCustomerId(users.get(0).getId());
+            consultSheet.setServiceId(users.get(0).getId());
         } else if (users.size() > 1) {
             //当前分配
             for (Qyuser user: users) {
                 if (user.getPeakVal() < user.getAssigned()) {
-                    consultSheet.setCustomerId(user.getId());
+                    consultSheet.setServiceId(user.getId());
 
                     //增加分配人数
                     user.setAssigned(user.getAssigned() + 1);
@@ -175,7 +175,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
             }
 
             //峰值已满
-            if (consultSheet.getCustomerId() == null) {
+            if (consultSheet.getServiceId() == null) {
                 Conds unconds = new Conds();
                 unconds.equal("t.del_flag", Constants.DEL_FLAG_0);
                 unconds.equal("t.user_type", "0");
@@ -184,7 +184,7 @@ public class ConsultSheetServiceImpl extends GenericServiceImpl<ConsultSheet> im
                 users = qyuserService.fetchSearchByPage(conds, unsort, 0, 0);
                 if (users.size() > 0) {
                     Qyuser user = users.get(0);
-                    consultSheet.setCustomerId(user.getId());
+                    consultSheet.setServiceId(user.getId());
 
                     //增加分配人数
                     user.setAssigned(user.getAssigned() + 1);

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

@@ -30,9 +30,9 @@
         <result column="drugs_num" property="drugsNum"/>
         <result column="product_number" property="productNumber"/>
         <result column="product_name" property="productName"/>
-        <result column="address" property="address"/>
         <result column="courier_number" property="courierNumber"/>
-
+        <result column="address_id" property="addressId"/>
+        <result column="clerk_id" property="clerkId"/>
     </resultMap>
 
     <resultMap id="resultMapList" type="com.cftech.order.model.Order">
@@ -63,7 +63,7 @@
         <result column="drugs_num" property="drugsNum"/>
         <result column="product_number" property="productNumber"/>
         <result column="product_name" property="productName"/>
-        <result column="address" property="address"/>
+        <result column="address_id" property="addressId"/>
         <result column="courier_number" property="courierNumber"/>
         <collection property="list" ofType="com.cftech.order.model.ProductVO">
             <result column="product_name" property="productName"/>
@@ -137,6 +137,7 @@
 	o.courier_number AS courierNumber,
 	CONCAT( a.areaname, b.areaname, c.areaname, s.address ) AS address
     </sql>
+
     <sql id="sqlColumnProduct">
     d.id,
 	d.order_id,
@@ -165,16 +166,38 @@
             keyProperty="id">
         insert into t_order
         (
-        <include refid="sqlColumns"/>
+            `id`,
+            `number`,
+            `openid`,
+            `pay_status`,
+            `pay_amount`,
+            `order_amount`,
+            `total_amount`,
+            `pay_time`,
+            `trade_no`,
+            `courier_number`,
+            `confirm`,
+            `order_cancel`,
+            `remarks`,
+            `accounts_id`,
+            `del_flag`,
+            `status`,
+            `create_time`,
+            `update_time`,
+            `description`,
+            `create_by`,
+            `update_by`,
+            `consult_id`,
+            `address_id`,
+            `member_id`,
+            `service_id`,
+            `doctor_id`,
+            `clerk_id`
         )
         values
         (
             #{id, jdbcType=BIGINT},
-        #{consultId, jdbcType=BIGINT},
             #{number, jdbcType=VARCHAR},
-        #{memberId, jdbcType=BIGINT},
-        #{serviceId, jdbcType=BIGINT},
-        #{doctorId, jdbcType=BIGINT},
             #{openid, jdbcType=VARCHAR},
             #{payStatus, jdbcType=BIGINT},
             #{payAmount, jdbcType=DECIMAL},
@@ -182,13 +205,24 @@
             #{totalAmount, jdbcType=DECIMAL},
             now(),
             #{tradeNo, jdbcType=VARCHAR},
-        #{remarks, jdbcType=VARCHAR},
+            #{courierNumber, jdbcType=VARCHAR},
+            #{confirm, jdbcType=BIGINT},
             #{orderCancel, jdbcType=VARCHAR},
+            #{remarks, jdbcType=VARCHAR},
             #{accountsId, jdbcType=BIGINT},
             #{delFlag, jdbcType=TINYINT},
             #{status, jdbcType=VARCHAR},
             now(),
-        now()
+            now(),
+            #{description, jdbcType=VARCHAR},
+            #{createBy, jdbcType=BIGINT},
+            #{updateBy, jdbcType=BIGINT},
+            #{consultId, jdbcType=BIGINT},
+            #{addressId, jdbcType=BIGINT},
+            #{memberId, jdbcType=BIGINT},
+            #{serviceId, jdbcType=BIGINT},
+            #{doctorId, jdbcType=BIGINT},
+            #{clerkId, jdbcType=BIGINT}
         )
     </insert>
 
@@ -250,6 +284,7 @@
     <select id="listProduct" resultType="com.cftech.order.model.ProductOrder">
         SELECT id, product_name as productName,price FROM t_aidea_product
     </select>
+
     <update id="update" parameterType="com.cftech.order.model.Order">
         update t_order
         <set>
@@ -292,6 +327,12 @@
             <if test="tradeNo != null">
                 trade_no = #{tradeNo, jdbcType=VARCHAR},
             </if>
+            <if test="courierNumber != null">
+                courier_number = #{courierNumber, jdbcType=VARCHAR},
+            </if>
+            <if test="confirm != null">
+                confirm = #{confirm, jdbcType=BIGINT},
+            </if>
             <if test="remarks != null">
                 remarks = #{remarks, jdbcType=VARCHAR},
             </if>
@@ -319,6 +360,24 @@
             <if test="updateBy != null">
                 update_by = #{updateBy, jdbcType=BIGINT},
             </if>
+            <if test="consultId != null">
+                consult_id = #{consultId, jdbcType=BIGINT},
+            </if>
+            <if test="addressId != null">
+                address_id = #{addressId, jdbcType=BIGINT},
+            </if>
+            <if test="memberId != null">
+                member_id = #{memberId, jdbcType=BIGINT},
+            </if>
+            <if test="serviceId != null">
+                service_id = #{serviceId, jdbcType=BIGINT},
+            </if>
+            <if test="doctorId != null">
+                doctor_id = #{doctorId, jdbcType=BIGINT},
+            </if>
+            <if test="clerkId != null">
+                clerk_id = #{clerkId, jdbcType=BIGINT},
+            </if>
         </set>
         where id=#{id,jdbcType=BIGINT}
     </update>

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

@@ -20,21 +20,9 @@ public class Order extends OrderDetail implements Serializable {
 
     /* 主键id */
     private Long id;
-    /* 咨询单id */
-    @ExportConfig(value = "咨询单id", width = 100, showLevel = 1)
-    private Long consultId;
     /* 订单编码 */
     @ExportConfig(value = "订单编码", width = 100, showLevel = 1)
     private String number;
-    /* 所属会员id */
-    @ExportConfig(value = "所属会员id", width = 100, showLevel = 1)
-    private Long memberId;
-    /* 客服id */
-    @ExportConfig(value = "客服id", width = 100, showLevel = 1)
-    private Long serviceId;
-    /* 医生id */
-    @ExportConfig(value = "医生id", width = 100, showLevel = 1)
-    private Long doctorId;
     /* 用户所属公众号id */
     @ExportConfig(value = "用户所属公众号id", width = 100, showLevel = 1)
     private String openid;
@@ -56,18 +44,39 @@ public class Order extends OrderDetail implements Serializable {
     /* 交易号 支付宝/第三方平台 返回订单号 */
     @ExportConfig(value = "交易号 支付宝/第三方平台 返回订单号", width = 100, showLevel = 1)
     private String tradeNo;
-    /* 卖家备注 */
-    @ExportConfig(value = "卖家备注", width = 100, showLevel = 1)
-    private String remarks;
+    /* 顺丰运单号 */
+    private String courierNumber;
+    /* 用户是否确认  0：待确认 1：已确认 2：取消 */
+    private Long confirm;
     /* 订单取消原因 */
     @ExportConfig(value = "订单取消原因", width = 100, showLevel = 1)
     private String orderCancel;
+    /* 卖家备注 */
+    @ExportConfig(value = "卖家备注", width = 100, showLevel = 1)
+    private String remarks;
     /* 所属的账号 */
     private Long accountsId;
     /* 删除标识 */
     private boolean delFlag;
     /* 状态 */
     private String status;
+    /* 咨询单id */
+    @ExportConfig(value = "咨询单id", width = 100, showLevel = 1)
+    private Long consultId;
+    /* 收货地址 */
+    private Long addressId;
+    /* 所属会员id */
+    @ExportConfig(value = "所属会员id", width = 100, showLevel = 1)
+    private Long memberId;
+    /* 客服id */
+    @ExportConfig(value = "客服id", width = 100, showLevel = 1)
+    private Long serviceId;
+    /* 医生id */
+    @ExportConfig(value = "医生id", width = 100, showLevel = 1)
+    private Long doctorId;
+    /* 订单员id */
+    @ExportConfig(value = "订单员id", width = 100, showLevel = 1)
+    private Long clerkId;
     /* 创建时间 */
     @JSONField(format = "yyyy-MM-dd HH:mm:ss")
     private Date createTime;
@@ -79,20 +88,15 @@ public class Order extends OrderDetail implements Serializable {
     private Long createBy;
     /* 更新人 */
     private Long updateBy;
-
-    private Long confirm;
-
-    private String courierNumber;
-
     /* 产品编码 */
     private String productNumber;
     /* 产品名称 */
     private String productName;
-    /* 收货地址 */
-    private String address;
 
     private Long productId;
 
+    private String address;
+
     private List<ProductVO> list;
 
     public Order() {
@@ -340,12 +344,20 @@ public class Order extends OrderDetail implements Serializable {
         this.productName = productName;
     }
 
-    public String getAddress() {
-        return address;
+    public Long getAddressId() {
+        return addressId;
     }
 
-    public void setAddress(String address) {
-        this.address = address;
+    public void setAddressId(Long addressId) {
+        this.addressId = addressId;
+    }
+
+    public Long getClerkId() {
+        return clerkId;
+    }
+
+    public void setClerkId(Long clerkId) {
+        this.clerkId = clerkId;
     }
 
     public List<ProductVO> getList() {
@@ -356,5 +368,11 @@ public class Order extends OrderDetail implements Serializable {
         this.list = list;
     }
 
+    public String getAddress() {
+        return address;
+    }
 
+    public void setAddress(String address) {
+        this.address = address;
+    }
 }
\ No newline at end of file

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

@@ -23,7 +23,6 @@ public class OrderDetail implements Serializable {
     /* 商品id */
     @ExportConfig(value = "商品id", width = 100, showLevel = 1)
     private Long drugsId;
-
     /* 商品数量 */
     @ExportConfig(value = "商品数量", width = 100, showLevel = 1)
     private Long drugsNum;

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

@@ -4,13 +4,17 @@ WX_MP_SERVER_APPID=wxc587e8869baec269
 #\u670D\u52A1\u53F7\u4E8C\u7EF4\u7801\u524D\u7F00
 WX_MP_QRCODE_URI=https://mp.weixin.qq.com/cgi-bin/showqrcode?ticket=
 
-
 #\u4F01\u4E1A\u53F7\u53D1\u9001\u6D88\u606F\uFF0C\u57DF\u540D\u914D\u7F6E
-#QY_DOMAIN_NAME = http://www.yxpt.tglxh.com/cfwechat
-QY_DOMAIN_NAME = https://pd.shxrtech.com/schaeffler
+QY_DOMAIN_NAME = https://pd.shxrtech.com/adiea
 QY_DOMAIN = https://pd.shxrtech.com
-#\u7EF4\u4FEE\u8FDB\u5EA6\u6A21\u677F\u6D88\u606FID
-WOEK_TEMPLATE_MESSAGE=8m-_tt_EqoQO-wsE6_JLJdn3nO15_hgUp9mLTujz5RU
+
+#\u6A21\u677F\u6D88\u606FID LSIT
+#\u54A8\u8BE2\u5355\u5BA1\u6838\u901A\u8FC7\u6A21\u677F\u6D88\u606F
+CONSULT_SHEET_AUDIT_SUCCESS_TEMPLATE_MSG=AoZzYGqvG5h5wDDDOE_fUrdMOam-QTqTc7wkBO7-VmU
+#\u54A8\u8BE2\u5355\u5BA1\u6838\u62D2\u7EDD\u6A21\u677F\u6D88\u606F
+CONSULT_SHEET_AUDIT_REFUSE_TEMPLATE_MSG=VSTKsUB_vK8UaiaZplmgk4IvrqIAfIiRD54mUlGR0k0
+#\u54A8\u8BE2\u4F46\u5BA1\u6838\u5931\u8D25\u6A21\u677F\u6D88\u606F
+CONSULT_SHEET_AUDIT_FAILED_TEMPLATE_MSG=77tLdRPQx1m8Gg0-t9HCGVOlka0G4ocFPdq8D5UkHwk
 
 
 #\u56FE\u7247\u4E0A\u4F20\u5730\u5740

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

@@ -29,7 +29,7 @@
         <result column="invitcode" property="invitcode"/>
         <result column="compan" property="compan"/>
         <result column="position" property="position"/>
-        <result column="customer_id" property="customerId"/>
+        <result column="service_id" property="serviceId"/>
     </resultMap>
 
     <resultMap id="resultMapDto" type="com.cftech.member.model.MemberDto">
@@ -104,7 +104,7 @@
                                                 oilSum,
                                                 invitcode,
                                                 compan,
-                                                customer_id
+                                                service_id
                         </sql>
 
     <sql id="sqlColumnslist">
@@ -135,7 +135,7 @@
                                                 oilSum,
                                                 invitcode,
                                                 compan,
-                                                customer_id
+                                                service_id
                         </sql>
     <insert id="save" parameterType="com.cftech.member.model.Member" useGeneratedKeys="true"
             keyProperty="id">
@@ -173,7 +173,7 @@
         #{doctorId,jdbcType=VARCHAR},
         #{invitcode,jdbcType=VARCHAR},
         #{compan,jdbcType=VARCHAR},
-        #{customer_id, jdbc=VARCHAR}
+        #{serviceId, jdbc=VARCHAR}
         )
     </insert>
 
@@ -255,7 +255,7 @@
             member.invitcode,
             member.compan,
             member.sex,
-        member.customer_id
+            member.service_id
         FROM
         wx_mp_member member
         <include refid="sqlWhere"/>
@@ -347,6 +347,9 @@
             <if test="compan != null">
                 compan = #{compan, jdbcType=VARCHAR}
             </if>
+            <if test="serviceId != null">
+                service_id = #{serviceId, jdbcType=VARCHAR}
+            </if>
         </set>
         where id=#{id,jdbcType=BIGINT}
     </update>

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

@@ -124,7 +124,7 @@ public class Member implements Serializable {
      * 所属客服id
      */
     //private String member_uid;
-    private String customerId;
+    private String serviceId;
 
     /**
      * 所属药师id

membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/model/Address.java

@@ -7,61 +7,61 @@ import java.io.Serializable;
 import java.util.Date;
 
 /**
-* 收货地址管理
-*
-* @author Licc
-* @date: 2020-09-29 17:17
-*/
+ * 收货地址管理
+ *
+ * @author Licc
+ * @date: 2020-09-29 17:17
+ */
 @Data
 public class Address extends Area implements Serializable {
 
-/* 主键id */
+    /* 主键id */
     private Long id;
-/* openId */
+    /* openId */
     @ExportConfig(value = "openId", width = 100, showLevel = 1)
     private String openId;
-/* 收货人name */
+    /* 收货人name */
     @ExportConfig(value = "收货人name", width = 100, showLevel = 1)
     private String addressName;
-/* 详细收货地址 */
+    /* 详细收货地址 */
     @ExportConfig(value = "详细收货地址", width = 100, showLevel = 1)
     private String address;
-/* 省份id */
+    /* 省份id */
     @ExportConfig(value = "省份id", width = 100, showLevel = 1)
     private Long provinceId;
-/* 城市id */
+    /* 城市id */
     @ExportConfig(value = "城市id", width = 100, showLevel = 1)
     private Long cityId;
-/*  区县id*/
+    /*  区县id*/
     @ExportConfig(value = "区县id", width = 100, showLevel = 1)
     private Long areaId;
-/* 性别 */
+    /* 性别 */
     @ExportConfig(value = "性别", width = 100, showLevel = 1)
     private Long sex;
-/* 手机号 */
+    /* 手机号 */
     @ExportConfig(value = "手机号", width = 100, showLevel = 1)
     private String phone;
-/* 是否为默认地址 */
+    /* 是否为默认地址 */
     @ExportConfig(value = "是否为默认地址", width = 100, showLevel = 1)
     private Long whether;
-/* 所属的账号 */
+    /* 所属的账号 */
     private Long accountsId;
-/* 删除标识 */
+    /* 删除标识 */
     private boolean delFlag;
-/* 状态 */
+    /* 状态 */
     private String status;
-/* 创建时间 */
+    /* 创建时间 */
     private Date createTime;
-/* 更新时间 */
+    /* 更新时间 */
     private Date updateTime;
-/* 备注 */
+    /* 备注 */
     private String description;
-/* 创建人 */
+    /* 创建人 */
     private Long createBy;
-/* 更新人 */
+    /* 更新人 */
     private Long updateBy;
 
-public Address() {
+    public Address() {
         this.delFlag = false;
         this.status = "0";
     }

membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/web/AddressController.java

@@ -71,7 +71,7 @@ public class AddressController {
 
     //提交数据（新增、修改）
     @RequiresPermissions(value = ADDRESS_EDIT)
-    @RequestMapping(value = "/formData",method = {RequestMethod.GET})
+    @RequestMapping(value = "/formData", method = {RequestMethod.GET})
     @ResponseBody
     public JSONObject formData(Address address, HttpServletRequest request) {
         Long accountsId = UserUtils.getmpaccounts(request);
@@ -108,17 +108,17 @@ public class AddressController {
         Conds conds = new Conds();
         conds.equal("t.del_flag", Constants.DEL_FLAG_0);
         conds.equal("t.accounts_id", accountsId);
-        if (!StringUtils.isEmpty(address.getAddressName())){
-            conds.like("t.address_name",address.getAddressName());
+        if (!StringUtils.isEmpty(address.getAddressName())) {
+            conds.like("t.address_name", address.getAddressName());
         }
-        if (!StringUtils.isEmpty(address.getProvinceId())){
-            conds.equal("t.province_id",address.getProvinceId());
+        if (!StringUtils.isEmpty(address.getProvinceId())) {
+            conds.equal("t.province_id", address.getProvinceId());
         }
-        if (!StringUtils.isEmpty(address.getCityId())){
-            conds.equal("t.city_id",address.getCityId());
+        if (!StringUtils.isEmpty(address.getCityId())) {
+            conds.equal("t.city_id", address.getCityId());
         }
-        if (!StringUtils.isEmpty(address.getAreaId())){
-            conds.equal("t.area_id",address.getAreaId());
+        if (!StringUtils.isEmpty(address.getAreaId())) {
+            conds.equal("t.area_id", address.getAreaId());
         }
         Sort sort = new Sort("t.create_time", OrderType.DESC);
 
@@ -145,12 +145,14 @@ public class AddressController {
         }
         return rtnJosn;
     }
+
     @GetMapping("/listArea")
     @ResponseBody
-    public List<Area> listArea(){
+    public List<Area> listArea() {
 
         return addressService.listArea();
     }
+
     @RequestMapping("/exportExcel")
     @RequiresPermissions(value = ADDRESS_VIEW)
     public void exportExcel(HttpServletRequest request, HttpServletResponse response) {

membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/web/MobileAddressController.java

@@ -31,78 +31,82 @@ public class MobileAddressController {
 
 
     /**
+     * @return
      * @Description 个人收货地址数据回填
      * @Date 9:53 2020/10/20
      * @Param
-   * @return
      **/
-  @RequestMapping(value = "/addressList",method = {RequestMethod.GET,RequestMethod.POST},produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-  public JSONObject addressList(String openId){
+    @RequestMapping(value = "/addressList", method = {RequestMethod.GET, RequestMethod.POST}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public JSONObject addressList(String openId) {
         return addressService.addressList(openId);
     }
+
     /**
+     * @return
      * @Description 根据id查询收货地址
      * @Date 9:53 2020/10/20
      * @Param
-   * @return
      **/
-  @RequestMapping(value = "/addressId",method = {RequestMethod.GET,RequestMethod.POST},produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-  public JSONObject addressId(Long id){
+    @RequestMapping(value = "/addressId", method = {RequestMethod.GET, RequestMethod.POST}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public JSONObject addressId(Long id) {
         return addressService.addressId(id);
     }
+
     /**
+     * @return
      * @Description 省市区信息回填
      * @Date 9:53 2020/10/20
      * @Param
-   * @return
      **/
-  @RequestMapping(value = "/listArea",method = {RequestMethod.GET,RequestMethod.POST},produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-  public JSONObject listArea(){
+    @RequestMapping(value = "/listArea", method = {RequestMethod.GET, RequestMethod.POST}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public JSONObject listArea() {
         JSONObject rtnJson = new JSONObject();
         try {
 
             List<Area> areas = addressService.listArea();
-      if (!areas.equals("") ||areas!=null){
-        rtnJson.put("errorNo","0");
-        rtnJson.put("data",areas);
+            if (!areas.equals("") || areas != null) {
+                rtnJson.put("errorNo", "0");
+                rtnJson.put("data", areas);
             }
-    }catch (Exception e){
+        } catch (Exception e) {
             e.printStackTrace();
-      rtnJson.put("errorNO","1");
+            rtnJson.put("errorNO", "1");
         }
 
         return rtnJson;
     }
+
     /**
+     * @return
      * @Description 个人收货地址新增
      * @Date 9:53 2020/10/20
      * @Param
-   * @return
      **/
-  @RequestMapping(value = "/addressAdd",method = {RequestMethod.GET,RequestMethod.POST},produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-  public JSONObject addressAdd(Address address){
+    @RequestMapping(value = "/addressAdd", method = {RequestMethod.GET, RequestMethod.POST}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public JSONObject addressAdd(Address address) {
         return addressService.addressAdd(address);
     }
+
     /**
-   *
+     * @return
      * @Description 收货地址修改
      * @Date 15:19 2020/10/20
      * @Param
-   * @return
      **/
-  @RequestMapping(value = "/updateAddress",method = {RequestMethod.GET,RequestMethod.POST},produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-  public JSONObject updateAddress(Address address){
+    @RequestMapping(value = "/updateAddress", method = {RequestMethod.GET, RequestMethod.POST}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public JSONObject updateAddress(Address address) {
         return addressService.updateAddress(address);
     }
+
     /**
+     * @return
      * @Author Licc
      * @Description 收货地址删除
      * @Date 15:52 2020/10/20
      * @Param
-   * @return
      **/
-  @RequestMapping(value = "/deleteAddress",method = {RequestMethod.GET,RequestMethod.POST},produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
-  public JSONObject deleteAddress(String id){
+    @RequestMapping(value = "/deleteAddress", method = {RequestMethod.GET, RequestMethod.POST}, produces = MediaType.APPLICATION_JSON_UTF8_VALUE)
+    public JSONObject deleteAddress(String id) {
         return addressService.deleteAddress(id);
     }
 }