个人信息，收货地址接口

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

@@ -77,13 +77,13 @@
                     <div class="box">
                         <div class="box-header">
                             <form id="seachTableForm" action="#springUrl('/a/consultSheet/list')" method="get">
-                                <div class="col-xs-5" style="width: 800px">
+
                                     <div class="col-xs-2" >
-                                        <input type="text" class="form-control required" style="width:  100px"
+                                        <input type="text" class="form-control "
                                                name="userName" placeholder="用药人姓名">
                                     </div>
                                     <div class="col-xs-2">
-                                        <input type="text" class="form-control required" style="width:  100px"
+                                        <input type="text" class="form-control "
                                                name="illness" placeholder="病情描述">
                                     </div>
                                     <a href="javascript:void(0)" class="btn btn-primary search">搜索</a>
@@ -92,7 +92,7 @@
                                     <a href="#springUrl('/a/consultSheet/exportExcel')" class="btn btn-primary">导出</a>
 
                                     #end
-                                </div>
+
                             </form>
                         </div><!-- /.box-header -->
                         <div class="box-body">

aidea-modules/order-detail-module-web/src/main/webapp/WEB-INF/views/orderDetails/orderDetailslist.html

@@ -77,13 +77,13 @@
                     <div class="box">
                         <div class="box-header">
                             <form id="seachTableForm" action="#springUrl('/a/orderDetails/list')" method="get">
-                                <div class="col-xs-5">
+
                                     <div class="col-xs-2" >
-                                        <input  type="text" class="form-control required"
+                                        <input  type="text" class="form-control "
                                                 id="orderCode" name="orderCode" placeholder="订单编码">
                                     </div>
                                     <div class="col-xs-2" >
-                                        <input  type="text" class="form-control required"
+                                        <input  type="text" class="form-control "
                                                 id="drugsCode" name="drugsCode" placeholder="商品编码">
                                     </div>
                                     <button type="button" class="search btn btn-primary">搜索</button>
@@ -92,7 +92,6 @@
                                     <!--                                                                            <a href="#springUrl('/a/orderDetails/exportExcel')" class="btn btn-primary">导出</a>-->
                                     <!--                                        <a onclick="importExcel();" class="btn btn-primary">导入</a>-->
                                     <!--                                                                        #end-->
-                                </div>
                             </form>
                         </div><!-- /.box-header -->
                         <div class="box-body">

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

@@ -105,11 +105,11 @@
 
 
                                             <th style="width:15%; "><label
-                                                    style="margin-right: 210px ; margin-left: 50px">商品名称</label></th>
-                                            <th style="width:45%;"><label style="margin-right: 210px">商品购买数量</label>
+                                                    style="width: 180px;margin-right: 80px;text-align: center">商品名称</label></th>
+                                            <th style=""><label style="width: 180px;margin-right: 80px;text-align: center">商品购买数量</label>
                                             </th>
-                                            <th style="width:30%;"><label style="margin-right: 210px">商品单价</label></th>
-                                            <th style="width:30%;"><label>商品总价</label></th>
+                                            <th style=""><label style="width: 160px;margin-right: 80px;text-align: center">商品单价</label></th>
+                                            <th style=""><label style="width: 180px;margin-right: 80px;text-align: center">商品总价</label></th>
 
 
                                     </div>
@@ -158,13 +158,6 @@
                                            maxlength="50" placeholder=""
                                            value="$!{data.createTime}"
                                     >
-                                    <label>用户是否确认<font style="color: red"></font></label>
-                                    <input type="text"
-                                           class="form-control" name="confirm"
-                                           id="confirm" readonly="readonly"
-                                           maxlength="50" placeholder=""
-                                           value="$!{data.confirm}"
-                                    >
                                     <div id="divClass">
                                         <label>订单取消原因<font style="color: red"></font></label>
                                         <input type="text"
@@ -227,7 +220,7 @@
 <script>
     var  csrf='${_csrf.token}';
     var csrf_header='${_csrf.headerName}';
-    var areaList;
+    var areaList = [];
 
     function list() {
         var url = "#springUrl('/a/order/fromProduct')"
@@ -235,8 +228,8 @@
             url: url,
             type: "GET",
             success: function (data) {
-                console.log(data)
-                areaList = data
+                console.log(data+"aaaa")
+                areaList = JSON.parse(data.data);
                 // var province = document.querySelector('#selectProduct')
                 // for (index in areaList) {
                 //     var op = new Option(areaList[index].productName, areaList[index].id, false, false)
@@ -280,16 +273,7 @@
             $("#payStatus").val("");
         }
 
-        var confirm = $("#confirm").val();
-        if (confirm == '0') {
-            $("#confirm").val("待确认");
-        } else if (confirm == '0') {
-            $("#confirm").val("已确认");
-        } else if (confirm == '0') {
-            $("#confirm").val("已取消");
-        } else {
-            $("#confirm").val("");
-        }
+
         var confirm = $("#confirm").val();
         if (confirm = '0') {
             $("#divClass").css('display', 'blocks')
@@ -316,7 +300,7 @@
 
 
     function clickAdd(id, count, price, amount) {
-
+        debugger
         var options = areaList.map(function (item) {
             if (id && id != null && item.id === id) {
                 return `<option selected value="${item.id}" data-price="${item.price}">${item.productName}</option>`
@@ -329,35 +313,37 @@
         var listHtml = "";
 
         if (count && count != null) {
-
-            listHtml += `<input name="listHtml" type='number' oninput="if(value>100)value=100;if(value.length>2)value=value.slice(0,2);if(value<=0)value=1" onchange="updateCount(this)" value=${count} ></input>`;
+            price
+            listHtml += `<input name="listHtml" type='number' style="width: 180px;margin-right: 80px" oninput="if(value>100)value=100;if(value.length>2)value=value.slice(0,2);if(value<=0)value=1" onchange="updateCount(this)" value=${count} ></input>`;
         } else {
-            listHtml += `<input name="listHtml" type='number'  oninput="if(value>100)value=100;if(value.length>2)value=value.slice(0,2);if(value<=0)value=1" onchange="updateCount(this)" value="1"></input>`;
+            listHtml += `<input name="listHtml" type='number' style="width: 180px ;margin-right: 80px" oninput="if(value>100)value=100;if(value.length>2)value=value.slice(0,2);if(value<=0)value=1" onchange="updateCount(this)" value="1"></input>`;
         }
 
         var HtmlPrice = "";
-
         if (price && price != null) {
-            HtmlPrice += `<input  name="htmlPrice" style="margin-left: 100px" type='text' readonly="readonly"  value=${price} ></input>`;
+            HtmlPrice += `<input  name="htmlPrice" style="width: 180px ;margin-right: 80px" type='text' readonly="readonly"  value="`+price.toFixed(2)+`"></input>`;
         } else {
             // var item = areaList.find(item => item.id === id)
             var item = areaList[0]
-            HtmlPrice += `<input   name="htmlPrice" data-price="${item.id}" style="margin-left: 100px" type="text"  readonly="readonly" value="${item.price}"></input>`
+            priveTmp = item.price.toFixed(2)
+            HtmlPrice += `<input   name="htmlPrice" data-price="${item.id}" style="width: 180px ;margin-right: 80px" type="text"  readonly="readonly" value="${priveTmp}"></input>`
         }
         var HtmlAmount = "";
 
         if (amount && amount != null) {
-            HtmlAmount += `<input id="htmlAmount" name="htmlAmount" style="margin-left: 100px" type='text' readonly="readonly"   value=${amount} ></input>`;
+            // var amout = ${amount};
+            HtmlAmount += `<input id="htmlAmount" name="htmlAmount" style="width: 180px ;margin-right: 80px" type='text' readonly="readonly"   value="`+amount .toFixed(2)+`" ></input>`;
         } else {
             // var item = areaList.find(item => item.id === id)
             var countSi = 1;
             var amountPrice = countSi * item.price
+            var amountTmp = amountPrice.toFixed(2)
             var item = areaList[0]
-            HtmlAmount += `<input id="htmlAmount" name="htmlAmount"  data-price="${item.id}" style="margin-left: 100px" type="text"  readonly="readonly"  value="${amountPrice}"></input>`
+            HtmlAmount += `<input id="htmlAmount" name="htmlAmount"  data-price="${item.id}" style="width: 180px ;margin-right: 80px" type="text"  readonly="readonly"  value="${amountTmp}"></input>`
         }
 
 
-        let html = `<br/> <div id="form-translate" class="translate" style="display: flex">
+        let html = `<div id="form-translate" class="translate" style="display: flex ;margin-bottom: 30px">
                             <select  class="form-control" name="releas" style="width: 180px ;margin-right: 80px"  onchange="getPrice(this)">
                                   ${options}
                             </select>
@@ -401,12 +387,15 @@
     function updatePrice(e) {
         // var orderAmount = $("#orderAmount");
         var valueSi = $(value).val();
-         $("#orderAmount").val(valueSi);
+        console.log('lsss',valueSi)
+     // var sign = Math.floor(valueSi * 100 ) /100
+          $("#orderAmount").val(valueSi.toFixed(2));
 
     }
     function deleteSelect(event) {
         var dom = event.target;
         var ret = $(dom);
+        console.log(ret.parent()+"ssss")
         ret.parent().remove();
         toTal()
     }
@@ -416,15 +405,18 @@
         $('.group [name="htmlAmount"]').each(function(index, item){
             count += +item.value
         })
-        $("#orderAmount").val(count);
+        $("#orderAmount").val(count.toFixed(2));
     }
     function save() {
-        $('.group [name="form-control"]').each(function (item) {
-
+        $('.translate').each(function (index,item) {
+            const productId = $(item).find('[name="releas"]').val()
+           if($('.translate').find('[name="releas"]')[index].value==$('.translate').find('[name="releas"]')[index+1].value){
+               alert('商品名称不能重复')
+           }
         })
 
-        var  id = $("#id").val()
-    var orderAmount = $("#orderAmount").val()
+            var  id = $("#id").val()
+         var orderAmount = $("#orderAmount").val()
         var datas = [];
         $('.translate').each(function (index,item){
             const productId = $(item).find('[name="releas"]').val()

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

@@ -77,25 +77,24 @@
                     <div class="box">
                         <div class="box-header">
                             <form id="seachTableForm" action="#springUrl('/a/order/list')" method="get">
-                                <div class="col-xs-5" style="width: 1400px">
-                                    <div class="col-xs-2"  style=" display: flex">
-                                        <input style="width: 100px" type="text" class="form-control required"
-                                               name="orderCode" placeholder="订单编号">
-                                        &nbsp;&nbsp;
-                                        <input style="width: 100px" type="text" class="form-control required"
-                                               name="productName" placeholder="产品名称">
-                                    </div>
 
+                                <div class="col-xs-2">
+                                    <input type="text" class="form-control "
+                                           name="orderCode" placeholder="订单编号">
+                                </div>
+                                <div class="col-xs-2">
+                                    <input type="text" class="form-control "
+                                           name="productName" placeholder="产品名称">
+                                </div>
 
+                                <button type="button" class="search btn btn-primary">搜索</button>
+                                #if($shiro.hasPermission("qy:order:edit"))
+                                <!--                                    <a href="#springUrl('/a/order/form')" class="btn btn-primary">新增</a>-->
+                                <a href="#springUrl('/a/order/exportExcel')" class="btn btn-primary">导出</a>
+                                #end
+                                <!--                                        <a onclick="importExcel();" class="btn btn-primary">导入</a>-->
 
-                                    <button type="button" class="search btn btn-primary">搜索</button>
-                                    #if($shiro.hasPermission("qy:order:edit"))
-                                    <!--                                    <a href="#springUrl('/a/order/form')" class="btn btn-primary">新增</a>-->
-                                    <a href="#springUrl('/a/order/exportExcel')" class="btn btn-primary">导出</a>
-                                    #end
-                                    <!--                                        <a onclick="importExcel();" class="btn btn-primary">导入</a>-->
 
-                                </div>
                             </form>
                         </div><!-- /.box-header -->
                         <div class="box-body">
@@ -113,7 +112,6 @@
                                     <th>支付交易号</th>
                                     <th>支付备注</th>
                                     <th>创建时间</th>
-                                    <th>用户是否确认</th>
                                     <th>操作</th>
                                 </tr>
                                 </thead>
@@ -251,10 +249,6 @@
                     "mData": "createTime"
                 }
                 ,
-                {
-                    "mData": "confirm"
-                }
-                ,
                 {
                     "mData": "id"
                 }
@@ -317,14 +311,14 @@
                     "aTargets": [7],
                     "mData": "payStatus",
                     "mRender": function (a, b, c, d) {
-                        if (a=='0'){
+                        if (a == '0') {
                             return "未付款";
-                        }else if (a=='1'){
+                        } else if (a == '1') {
                             return "已付款";
-                        } else if (a=='2'){
+                        } else if (a == '2') {
                             return "已取消";
-                        }  else{
-                            return  "";
+                        } else {
+                            return "";
                         }
                     }
                 },
@@ -348,29 +342,12 @@
                     "aTargets": [10],
                     "mData": "createTime",
                     "mRender": function (a, b, c, d) {
-                        return  formatDates(a);
+                        return formatDates(a);
                     }
                 }
                 ,
                 {
                     "aTargets": [11],
-                    "mData": "confirm",
-                    "mRender": function (a, b, c, d) {
-                        if (a=='0'){
-                            return "待确认";
-
-                        }else if (a=='1'){
-                            return "已确认";
-                        } else if (a=='2'){
-                            return "已取消";
-                        }  else{
-                            return  "";
-                        }
-                    }
-                }
-                ,
-                {
-                    "aTargets": [12],
                     "mData": "id",
                     "mRender": function (a, b, c, d) {
                         var html = '#if($shiro.hasPermission("qy:order:edit"))';

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

@@ -21,8 +21,8 @@ public interface OrderMapper extends GenericDao<Order> {
     OrderFromVO fetchId(Serializable id);
     List<OrderFromVO> fetchProductId(Serializable id);
     ProductDto fetchProduct(Map<String, Object> params);
-    Long saveDetill(OrderDetail orderDetail);
-    Long fetcheDeta(Map<String, Object> params);
+    Integer saveDetill(OrderDetail orderDetail);
+    Integer fetcheDeta(Map<String, Object> params);
     Long updateDetill(Map<String, Object> params);
     Order fetchOrder(Long id);
     Long updateOrder(Map<String, Object> params);

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

@@ -364,10 +364,10 @@
         </set>
         where order_id =#{id} and accounts_id=#{accountsId}
     </update>
-    <select id="fetcheDeta" parameterType="java.util.Map" resultType="java.lang.Long">
-        select *  from t_order_details where order_id =#{id} and  accounts_id=#{accountsId}
+    <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}
     </select>
-    <select id="saveDetill" parameterType="com.cftech.order.model.OrderDetail">
+    <select id="saveDetill" parameterType="com.cftech.order.model.OrderDetail" resultType="java.lang.Integer">
         insert into t_order_details
         (
         <include refid="Column"/>

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

 package com.cftech.order.model;
 
 import com.alibaba.fastjson.annotation.JSONField;
-import com.cftech.order.utils.JSONSeriableUtils;
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.annotation.JsonInclude;
-import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import lombok.Data;
-import org.omg.CORBA.PRIVATE_MEMBER;
 
 import java.util.Date;
 
@@ -33,7 +27,6 @@ public class OrderFromVO {
     private Date createTime;
     private Long confirm;
     private String orderCancel;
-
     private Double price;
     private Double amount;
 

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

@@ -68,7 +68,7 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
     @Override
     public Long newlyAdded(String datas, Long accountsId) {
         OrderDetail orderDetail = null;
-        Map<String, Object> params = null;
+        Map<String, Object> params =  new HashMap<String, Object>();;
         datas = datas.replaceAll("&quot;","\"");
         JSONArray jsonArray = JSONArray.fromObject(datas);
         if (jsonArray.size()>0){
@@ -80,20 +80,16 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
                 double price = jsonObject.getDouble("price");
                 double amount = jsonObject.getDouble("amount");
                 double orderAmount = jsonObject.getDouble("orderAmount");
-                params = new HashMap<String, Object>();
                 params.put("id",id);
                 params.put("accountsId",accountsId);
-                Long aLong = orderMapper.fetcheDeta(params);
-                if (aLong>0){
-                    params.put("productId",productId);
-                    params.put("drugsNum",drugsNum);
-                    params.put("price",price);
-                    params.put("amount",amount);
-                    Long detill = orderMapper.updateDetill(params);
-                    if (detill>0){
-                        return detill;
-                    }
-                }else{
+                params.put("productId",productId);
+                params.put("drugsNum",drugsNum);
+                params.put("price",price);
+                params.put("amount",amount);
+                Integer fetcheDeta = orderMapper.fetcheDeta(params);
+                if (fetcheDeta>0 || fetcheDeta!=null){
+                    orderMapper.updateDetill(params);
+                }else {
                     ProductDto productDtos = orderMapper.fetchProduct(params);
                     orderDetail = new OrderDetail();
                     Order orders = orderMapper.fetchOrder(id);
@@ -107,14 +103,12 @@ public class OrderServiceImpl extends GenericServiceImpl<Order> implements Order
                     orderDetail.setDrugsCode(productDtos.getProductNumber());
                     orderDetail.setDrugsSku(productDtos.getFormat());
                     orderDetail.setAccountsId(accountsId);
-                    Long detill = orderMapper.saveDetill(orderDetail);
+                    Integer detill = orderMapper.saveDetill(orderDetail);
                     if (detill>0){
                         orderMapper.updateOrder(params);
-                        return  detill;
                     }
-                }
-
 
+                }
             }
         }
 

aidea-modules/order-module/src/main/java/com/cftech/order/utils/DoubleJSONFilter.java

@@ -10,8 +10,8 @@ public class DoubleJSONFilter implements ValueFilter {
     public Object process(Object value, String s, Object o1) {
         if( o1 instanceof Double  ){
             BigDecimal bg = new BigDecimal((Double) o1);
-            Double f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
-            return 60.00;
+            BigDecimal f1 = bg.setScale(2, BigDecimal.ROUND_HALF_UP);
+            return f1;
         }
         return o1;
     }

aidea-modules/order-module/src/main/java/com/cftech/order/utils/JSONSeriableUtils.java

-package com.cftech.order.utils;
-
-import com.fasterxml.jackson.core.JsonGenerator;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.JsonSerializer;
-import com.fasterxml.jackson.databind.SerializerProvider;
-import org.apache.commons.lang3.math.NumberUtils;
-
-import java.io.IOException;
-import java.math.RoundingMode;
-import java.text.DecimalFormat;
-
-/**
- * @author ：licc
- * @date ：Created in 2020/10/16 17:37
- * @description：J
- */
-public class JSONSeriableUtils extends JsonSerializer<Double> {
-    @Override
-    public void serialize(Double aDouble, JsonGenerator jsonGenerator, SerializerProvider serializerProvider) throws IOException, JsonProcessingException {
-        if(aDouble !=null) {
-            DecimalFormat df = new DecimalFormat("0.00");
-            df.setRoundingMode(RoundingMode.HALF_UP);
-            jsonGenerator.writeString(df.format(aDouble));
-        }else {//这个分支不要忘记了，否则将不输出这个属性的值
-            jsonGenerator.writeString(aDouble.toString());
-        }
-    }
-}

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

@@ -84,9 +84,12 @@ public class OrderController {
     }
     @RequestMapping("/fromProduct")
     @ResponseBody
-    public List<ProductOrder> fromProduct(){
-
-        return orderService.listProduct();
+    public JSONObject fromProduct(){
+        List<ProductOrder> orders = orderService.listProduct();
+        String jsonArray =  JSON.toJSONString(orders, DOUBLE_JSON_FILTER ,SerializerFeature.WriteMapNullValue);
+        JSONObject object = new JSONObject();
+        object.put("data",jsonArray);
+        return object;
 
     }
 

aidea-modules/reportform-module-web/src/main/webapp/WEB-INF/views/reportForm/reportFormlist.html

@@ -77,33 +77,33 @@
                     <div class="box">
                         <div class="box-header">
                             <form id="seachTableForm" action="#springUrl('/a/reportForm/list')" method="get">
-                                <div class="col-xs-5">
+
                                     <div class="col-xs-2" >
-                                        <input  type="text" class="form-control required"
+                                        <input  type="text" class="form-control "
                                                 id="pharmacist" name="pharmacist" placeholder="药师名称">
                                     </div>
                                     <div class="col-xs-2" >
-                                        <input  type="text" class="form-control required"
+                                        <input  type="text" class="form-control "
                                                 id="customerName" name="customerName" placeholder="客服名称">
                                     </div>
                                     <div class="col-xs-2" >
-                                        <input  type="text" class="form-control required"
+                                        <input  type="text" class="form-control "
                                                 id="orderCode" name="orderCode" placeholder="订单号">
                                     </div>
                                     <div class="col-xs-2" >
-                                        <input  type="text" class="form-control required"
+                                        <input  type="text" class="form-control "
                                                 id="logisticsCode" name="logisticsCode" placeholder="物流单号">
                                     </div>
-                                    <button type="button" class="search btn btn-primary">搜索</button>
+                                    <button type="button" class="search btn btn-primary" style="margin-left: 20px">搜索</button>
                                     #if($shiro.hasPermission("qy:reportForm:edit"))
-                                    <a href="#springUrl('/a/reportForm/exportExcel')" class="btn btn-primary">导出</a>
+                                    <a href="#springUrl('/a/reportForm/exportExcel')" class="btn btn-primary" style="margin-left: 20px">导出</a>
                                     #end
 <!--                                  -->
 <!--                                    <a href="#springUrl('/a/reportForm/form')" class="btn btn-primary">新增</a>-->
 <!--                                   -->
 <!--                                    <a onclick="importExcel();" class="btn btn-primary">导入</a>-->
 <!--                                   -->
-                                </div>
+
                             </form>
                         </div><!-- /.box-header -->
                         <div class="box-body">

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

@@ -43,4 +43,13 @@ public interface MemberMapper extends GenericDao<Member> {
      * @return
      **/
     List<MemberVO> memberFormation(Long id);
+
+    /**
+     *
+     * 个人信息修改
+     *
+     * @Param
+     * @return
+     **/
+    int updateMember(MemberVO memberVO);
 }
\ No newline at end of file

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

@@ -350,8 +350,36 @@
 	wx_mp_member m
         <include refid="sqlWhere"/>
     </select>
+    <!--个人信息回填
+   -->
     <select id="memberFormation" parameterType="java.lang.Long" resultType="com.cftech.member.model.MemberVO">
-       SELECT CONCAT(surname,`name`) AS memberName,sex,birthday,imageurl,other AS mailbox,phone
-       FROM  wx_mp_member WHERE id= #{id}
+       SELECT `name` AS memberName,sex,birthday,imageurl,other AS mailbox,phone
+       FROM  wx_mp_member WHERE id= #{Id}
     </select>
+    <!--个人信息修改
+    -->
+    <update id="updateMember" parameterType="com.cftech.member.model.MemberVO" >
+        update wx_mp_member
+        <set>
+            <if test="memberName !=null">
+                `name` = #{memberName},
+            </if>
+            <if test="sex !=null">
+                sex = #{sex},
+            </if>
+            <if test="birthday !=null">
+                birthday = #{birthday},
+            </if>
+            <if test="mailbox !=null">
+                other = #{mailbox},
+            </if>
+            <if test="phone !=null">
+                phone = #{phone},
+            </if>
+            <if test="imageUrl !=null">
+                imageurl = #{imageUrl}
+            </if>
+        </set>
+        where  id =#{Id}
+    </update>
 </mapper>
\ No newline at end of file

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

 package com.cftech.member.model;
 
+import com.alibaba.fastjson.annotation.JSONField;
+import lombok.Data;
+
 import java.util.Date;
 
 /**
@@ -7,12 +10,15 @@ import java.util.Date;
  * @date ：Created in 2020/10/19 14:30
  * @description：
  */
+@Data
 public class MemberVO {
+    private  Long Id;
     /*姓名*/
     private  String memberName;
     /*性别*/
     private  Long Sex;
     /*生日*/
+    @JSONField(format = "yyyy-MM-dd")
     private Date birthday;
     /* 邮箱*/
     private String mailbox;
@@ -24,4 +30,6 @@ public class MemberVO {
     private String openid;
     /*accountsID*/
     private Long accountsID;
+
+
 }

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

@@ -106,11 +106,34 @@ public class MemberServiceImpl extends GenericServiceImpl<Member> implements Mem
     public JSONObject updateMember(MemberVO memberVO) {
         JSONObject rtnJson = new JSONObject();
         try {
-
+            if (StringUtils.isEmpty(memberVO.getMemberName())){
+                rtnJson.put("errorNo","1");
+                rtnJson.put("errorMsg","姓名不能为空");
+                return  rtnJson;
+            }
+            if (StringUtils.isEmpty(memberVO.getMailbox())){
+                rtnJson.put("errorNo","1");
+                rtnJson.put("errorMsg","邮箱不能为空");
+                return  rtnJson;
+            }
+            if (StringUtils.isEmpty(memberVO.getPhone())){
+                rtnJson.put("errorNo","1");
+                rtnJson.put("errorMsg","联系方式不能为空");
+                return  rtnJson;
+            }
+             int i = memberMapper.updateMember(memberVO);
+            if (i>0){
+                rtnJson.put("errorNo","0");
+                rtnJson.put("errorMsg","修改成功");
+            }else{
+                rtnJson.put("errorNo","1");
+                rtnJson.put("errorMsg","修改失败");
+                return rtnJson;
+            }
         }catch (Exception e){
             e.printStackTrace();
         }
-        return null;
+        return rtnJson;
     }
 
 

membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/dao/AddressMapper.java

 package com.cftech.addresst.dao;
 
 import com.cftech.addresst.model.Address;
+import com.cftech.addresst.model.AddressVO;
 import com.cftech.addresst.model.Area;
 import com.cftech.core.generic.GenericDao;
 
 import java.util.List;
+import java.util.Map;
 
 /**
 * 收货地址管理Mapper
@@ -13,5 +15,38 @@ import java.util.List;
 * @date: 2020-09-29 17:17
 */
 public interface AddressMapper extends GenericDao<Address> {
+    /**
+     *
+     * @Description  省市区地址查询
+     * @Date 14:58 2020/10/20
+     * @Param
+     * @return
+     **/
     List<Area> listArea();
+    /**
+     * @Description  个人收货地址数据回填
+     * @Date 9:53 2020/10/20
+     * @Param
+     * @return
+     **/
+    List<AddressVO> addressList(String openId);
+    /**
+     *
+     * @Description  默认地址修改
+     * @Date 11:44 2020/10/20
+     * @Param
+     * @return
+     *
+     **/
+    int updateWhether(Map<String,Object> param);
+    /**
+     *
+     * @Description  查询是否有默认地址
+     * @Date 11:44 2020/10/20
+     * @Param
+     * @return
+     *
+     **/
+
+    Integer whetherList(String openId);
 }
\ No newline at end of file

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

@@ -43,7 +43,7 @@ public class Address extends Area implements Serializable {
     private String phone;
 /* 是否为默认地址 */
         @ExportConfig(value = "是否为默认地址", width = 100, showLevel = 1)
-    private String whether;
+    private Long whether;
 /* 所属的账号 */
         private Long accountsId;
 /* 删除标识 */

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

+package com.cftech.addresst.model;
+
+import lombok.Data;
+
+/**
+ * @author ：licc
+ * @date ：Created in 2020/10/20 9:38
+ * @description：
+ */
+@Data
+public class AddressVO {
+    private Long Id;
+    private String openid;
+    /*收货人姓名*/
+    private String addressName;
+    /*详细收货地址*/
+    private String address;
+    /*省份id*/
+    private Long provinceId;
+    /*城市id*/
+    private Long cityId;
+    /*区县id*/
+    private Long areaId;
+    /*性别*/
+    private Long sex;
+    /*手机号*/
+    private String phone;
+    /*是否为默认地址*/
+    private String whether;
+    /*accounts_id*/
+    private Long accountsId;
+    /*省份*/
+    private String provinceName;
+    /*城市*/
+    private String cityName;
+    /*区县*/
+    private String areaName;
+}

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

+package com.cftech.addresst.model;
+
+import org.aspectj.lang.annotation.DeclareAnnotation;
+
+/**
+ * @author ：licc
+ * @date ：Created in 2020/10/20 11:06
+ * @description：
+ */

membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/service/AddressService.java

 package com.cftech.addresst.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.cftech.addresst.model.Address;
 import com.cftech.addresst.model.Area;
 import com.cftech.core.generic.GenericService;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.Serializable;
 import java.util.List;
 
 /**
@@ -14,5 +17,35 @@ import java.util.List;
 */
 public interface AddressService extends GenericService<Address> {
     List<Area> listArea();
+    /**
+     * @Description  个人收货地址数据回填
+     * @Date 9:53 2020/10/20
+     * @Param
+     * @return
+     **/
+    JSONObject addressList(String openId);
+    /**
+     * @Description  个人收货地址新增
+     * @Date 9:53 2020/10/20
+     * @Param
+     * @return
+     **/
+    JSONObject addressAdd(Address address);
 
+    /**
+     * @Author Licc
+     * @Description  个人收货地址修改
+     * @Date 15:23 2020/10/20
+     * @Param
+     * @return
+     **/
+    JSONObject updateAddress(Address address);
+    /**
+     * @Author Licc
+     * @Description  个人收货地址删除
+     * @Date 15:53 2020/10/20
+     * @Param
+     * @return
+     **/
+    JSONObject deleteAddress(String id);
 }

membercard-modules/shipping-address-module/src/main/java/com/cftech/addresst/service/impl/AddressServiceImpl.java

 package com.cftech.addresst.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
+import com.aspose.words.IFieldMergingCallback;
 import com.cftech.addresst.model.Address;
 import com.cftech.addresst.dao.AddressMapper;
+import com.cftech.addresst.model.AddressVO;
 import com.cftech.addresst.model.Area;
 import com.cftech.addresst.service.AddressService;
 import com.cftech.core.generic.GenericDao;
 import com.cftech.core.generic.GenericServiceImpl;
 import com.cftech.core.sql.Conds;
+import com.cftech.sys.security.UserUtils;
+import com.esotericsoftware.minlog.Log;
+import org.apache.poi.hssf.record.chart.AxisUsedRecord;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
+import javax.servlet.http.HttpServletRequest;
+import java.io.Serializable;
+import java.util.HashMap;
 import java.util.List;
 
 /**
@@ -35,4 +45,169 @@ return addressMapper;
     public List<Area> listArea() {
         return addressMapper.listArea();
     }
+
+    @Override
+    public JSONObject addressList(String openId) {
+        JSONObject rtnJson = new JSONObject();
+    try {
+
+        if (openId.equals("")){
+            rtnJson.put("errorNo","1");
+            rtnJson.put("errorMsg","openId不能为空");
+            return rtnJson;
+        }
+        List<AddressVO> addressList = addressMapper.addressList(openId);
+        Log.info("参数:"+addressList);
+        if (!addressList.equals("")||addressList!=null){
+            rtnJson.put("errorNo","0");
+            rtnJson.put("data",addressList);
+        }
+    }catch (Exception e){
+        e.printStackTrace();
+        rtnJson.put("errorNo","1");
+    }
+
+        return rtnJson;
+    }
+
+
+    @Transactional
+    @Override
+    public JSONObject addressAdd(Address address) {
+        JSONObject rtnJson = new JSONObject();
+
+        try {
+            if (address.getOpenId().equals("")){
+                rtnJson.put("errorNO","1");
+                rtnJson.put("errorMsg","openid不能为空");
+            }
+            if (address.getAddressName().equals("")){
+                rtnJson.put("errorNO","1");
+                rtnJson.put("errorMsg","收货人姓名不能为空");
+            }
+            if (address.getPhone().equals("")){
+                rtnJson.put("errorNO","1");
+                rtnJson.put("errorMsg","手机号码不能为空");
+            }
+            if (address.getAddress().equals("")){
+                rtnJson.put("errorNO","1");
+                rtnJson.put("errorMsg","详细地址不能为空");
+            }
+            address.setOpenId(address.getOpenId());
+            address.setAccountsId(address.getAccountsId());
+            address.setDelFlag(false);
+            address.setAddressName(address.getAddressName());
+            address.setPhone(address.getPhone());
+            address.setAddress(address.getAddress());
+            address.setProvinceId(address.getProvinceId());
+            address.setCityId(address.getCityId());
+            address.setAreaId(address.getAreaId());
+
+            if ("1".equals(address.getWhether().toString())){
+            address.setWhether(address.getWhether());
+                Long whether = address.getWhether();
+                String openId = address.getOpenId();
+                Integer list = addressMapper.whetherList(openId);
+                if ( list!=null) {
+                    HashMap<String, Object> param = new HashMap<>();
+                    param.put("whether", whether);
+                    param.put("openId", openId);
+                    int i = addressMapper.updateWhether(param);
+                    if (i == 0) {
+                        rtnJson.put("errorNO", "1");
+                        rtnJson.put("errorMsg", "新增失败");
+                    }
+                }
+                addressMapper.save(address);
+                rtnJson.put("errorNO","0");
+                rtnJson.put("errorMsg","新增成功");
+
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            rtnJson.put("errorNO","1");
+        }
+        return rtnJson;
+    }
+    @Transactional
+    @Override
+    public JSONObject updateAddress(Address address) {
+        JSONObject rtnJson = new JSONObject();
+        try {
+            if (address.getOpenId().equals("")){
+                rtnJson.put("errorNO","1");
+                rtnJson.put("errorMsg","openid不能为空");
+            }
+            if (address.getAddressName().equals("")){
+                rtnJson.put("errorNO","1");
+                rtnJson.put("errorMsg","收货人姓名不能为空");
+            }
+            if (address.getPhone().equals("")){
+                rtnJson.put("errorNO","1");
+                rtnJson.put("errorMsg","手机号码不能为空");
+            }
+            if (address.getAddress().equals("")){
+                rtnJson.put("errorNO","1");
+                rtnJson.put("errorMsg","详细地址不能为空");
+            }
+            Log.info("参数:"+address);
+            address.setId(address.getId());
+            address.setAddressName(address.getAddressName());
+            address.setPhone(address.getPhone());
+            address.setAddress(address.getAddress());
+            address.setProvinceId(address.getProvinceId());
+            address.setCityId(address.getCityId());
+            address.setAreaId(address.getAreaId());
+            if ("1".equals(address.getWhether().toString())){
+                address.setWhether(address.getWhether());
+                Long whether = address.getWhether();
+                String openId = address.getOpenId();
+                Integer list = addressMapper.whetherList(openId);
+                if ( list!=null) {
+                    HashMap<String, Object> param = new HashMap<>();
+                    param.put("whether", whether);
+                    param.put("openId", openId);
+                    int i = addressMapper.updateWhether(param);
+                    if (i == 0) {
+                        rtnJson.put("errorNO", "1");
+                        rtnJson.put("errorMsg", "修改失败");
+                    }
+                }
+            }
+            int i = addressMapper.update(address);
+            if (i>0) {
+                rtnJson.put("errorNO","0");
+                rtnJson.put("errorMsg","修改成功");
+            }else {
+                rtnJson.put("errorNO","1");
+                rtnJson.put("errorMsg","修改失败");
+            }
+
+        }catch (Exception e){
+            e.printStackTrace();
+
+        }
+        return rtnJson;
+    }
+
+    @Override
+    public JSONObject deleteAddress(String id) {
+         JSONObject rtnJson = new JSONObject();
+         try {
+             if (id.equals("")){
+                 rtnJson.put("errorNO","1");
+                 rtnJson.put("errorMsg","id不能为空");
+             }
+             int delete = addressMapper.delete(id);
+             if (delete>0){
+                 rtnJson.put("errorNO","0");
+                 rtnJson.put("errorMsg","删除成功");
+             }
+         }catch (Exception e){
+             e.printStackTrace();
+             rtnJson.put("errorNO","1");
+         }
+        return rtnJson;
+    }
+
 }
\ No newline at end of file

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

@@ -73,7 +73,7 @@ public class AddressController {
     @RequiresPermissions(value = ADDRESS_EDIT)
     @RequestMapping(value = "/formData",method = {RequestMethod.GET})
     @ResponseBody
-    public JSONObject formData(Address address, Model model, HttpServletRequest request) {
+    public JSONObject formData(Address address, HttpServletRequest request) {
         Long accountsId = UserUtils.getmpaccounts(request);
         JSONObject rtnJson = new JSONObject();
         try {
@@ -84,11 +84,14 @@ public class AddressController {
             } else {
                 address.setAccountsId(accountsId);
                 address.setDelFlag(false);
+                address.setProvinceId(address.getProvinceId());
+                address.setCityId(address.getCityId());
+                address.setAreaId(address.getAreaId());
                 address.setAccountsId(UserUtils.getmpaccounts(request));
                 address.setCreateBy(UserUtils.getUser().getId());
                 address.setUpdateBy(UserUtils.getUser().getId());
-                addressService.save(address);
-                rtnJson.put("errorNo", 2);
+                  addressService.save(address);
+
             }
         } catch (Exception e) {
             rtnJson.put("errorNo", 1);

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

+package com.cftech.addresst.web;
+
+import com.alibaba.fastjson.JSONObject;
+import com.cftech.addresst.model.Address;
+import com.cftech.addresst.model.Area;
+import com.cftech.addresst.service.AddressService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.servlet.http.HttpServletRequest;
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author ：licc
+ * @date ：Created in 2020/10/19 18:11
+ * @description：收货地址修改
+ */
+@Slf4j
+@RestController
+@RequestMapping("mobile/auth/address")
+public class MobileAddressController {
+  @Autowired
+  private AddressService addressService;
+
+
+  /**
+   * @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){
+    return addressService.addressList(openId);
+  }
+  /**
+   * @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(){
+    JSONObject rtnJson = new JSONObject();
+    try {
+
+      List<Area> areas = addressService.listArea();
+      if (!areas.equals("") ||areas!=null){
+        rtnJson.put("errorNo","0");
+        rtnJson.put("data",areas);
+      }
+    }catch (Exception e){
+      e.printStackTrace();
+      rtnJson.put("errorNO","1");
+    }
+
+    return rtnJson;
+  }
+  /**
+   * @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){
+    return addressService.addressAdd(address);
+  }
+  /**
+   *
+   * @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){
+    return addressService.updateAddress(address);
+  }
+  /**
+   * @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){
+    return addressService.deleteAddress(id);
+  }
+}

workshop-module/src/main/java/com/cftech/workshop/activ/web/ActivController.java

 package com.cftech.workshop.activ.web;
 
 import com.alibaba.fastjson.JSONObject;
-import com.alibaba.fastjson.serializer.LongArraySerializer;
+
 import com.cftech.base.codingrule.utils.CodingruleUtils;
 import com.cftech.core.util.SystemConfig;
 import com.cftech.workshop.activ.model.Activ;