feat:订单部门

nightFragrance-massage/src/main/java/com/ylx/massage/domain/TOrder.java

@@ -228,6 +228,14 @@ public class TOrder implements Serializable {
     @ApiModelProperty("推荐者id")
     private String cTjOpenId;
 
+    @TableField("dept_id")
+    @ApiModelProperty("部门Id")
+    private String deptId;
+
+    @TableField("dept_name")
+    @ApiModelProperty("部门名称")
+    private String deptName;
+
     /**
      * 创建时间
      */

nightFragrance-massage/src/main/java/com/ylx/massage/service/impl/TOrderServiceImpl.java

@@ -146,6 +146,7 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
             throw new ServiceException("请先添加地址");
         }
         TJs js = jsService.getById(order.getcJsId());
+
         //添加位置信息
         locationUtil.geoAdd(LocationUtil.GEO_KEY_USER, js.getcOpenId() + order.getOrderNo(), Double.parseDouble(js.getLongitude().toString()), Double.parseDouble(js.getLatitude().toString()));
         locationUtil.geoAdd(LocationUtil.GEO_KEY_USER, order.getcOpenId() + order.getOrderNo(), Double.parseDouble(address.getLongitude().toString()), Double.parseDouble(address.getLatitude().toString()));
@@ -175,7 +176,8 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
         order.setcPhone(address.getPhone());
         order.setcName(address.getUserName());
         order.setAtlasAdd(address.getAtlasAdd());
-
+        order.setDeptId(js.getDeptId());
+        order.setDeptName(js.getCity());
         order.setnStatus(OrderStatusEnum.WAIT_PAY.getCode());
         order.setDtCreateTime(LocalDateTime.now());
         Date date = DateTimeUtils.addMinute(new Date(), 10);
@@ -215,8 +217,6 @@ public class TOrderServiceImpl extends ServiceImpl<TOrderMapper, TOrder> impleme
     public Object updateAddressById(TOrder borrow) {
         TOrder order = this.getById(borrow.getcId());
         if(borrow.getLatitude()!=null && borrow.getLatitude()!=0 && borrow.getLongitude()!=null && borrow.getLongitude()!=0){
-
-
             order.setAtlasAdd(borrow.getAtlasAdd());
             order.setcName(borrow.getcName());
             order.setcPhone(borrow.getcPhone());

nightFragrance-massage/src/main/resources/mapper/massage/TOrderMapper.xml

@@ -11,6 +11,8 @@
         <result column="price_difference" property="priceDifference"/>
         <result column="c_js_id" property="cJsId"/>
         <result column="tape" property="tape"/>
+        <result column="dept_id" property="deptId"/>
+        <result column="dept_name" property="deptName"/>
         <result column="new_js_id" property="newJsId"/>
         <result column="fare" property="fare"/>
         <result column="total_price" property="totalPrice"/>
@@ -96,6 +98,8 @@
         t_order.c_time,
         t_order.timeout_cause,
         t_order.name,
+        t_order.dept_id,
+        t_order.dept_name,
         t_order.latitude,
         t_order.longitude,
         t_order.address,
@@ -179,6 +183,9 @@
             <if test="param.cJsId != null and param.cJsId != ''">
                 and t_order.c_js_id = #{ param.cJsId }
             </if>
+            <if test="param.deptId != null and param.deptId != ''">
+                and t_order.dept_id = #{ param.deptId }
+            </if>
             <if test="param.cOpenId != null and param.cOpenId != ''">
                 and t_order.c_open_id = #{ param.cOpenId }
             </if>