fix:统计技师数据1

nightFragrance-admin/src/main/java/com/ylx/web/controller/massage/TCommentUserController.java

@@ -1,6 +1,7 @@
 package com.ylx.web.controller.massage;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -16,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.io.Serializable;
+import java.util.Date;
 import java.util.List;
 
 /**
@@ -44,7 +46,9 @@ public class TCommentUserController extends BaseController {
     @GetMapping("selectAll")
     @ApiOperation("分页查询所有数据")
     public R selectAll(Page<TCommentUser> page, TCommentUser tCommentUser) {
-        return R.ok(this.tCommentUserService.page(page, new QueryWrapper<>(tCommentUser)));
+        LambdaQueryWrapper<TCommentUser> tCommentUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        tCommentUserLambdaQueryWrapper.eq(TCommentUser::getOpenId, tCommentUser.getOpenId());
+        return R.ok(this.tCommentUserService.page(page, tCommentUserLambdaQueryWrapper));
     }
 
     /**
@@ -68,6 +72,7 @@ public class TCommentUserController extends BaseController {
     @PostMapping("add")
     @ApiOperation("新增数据")
     public R insert(@RequestBody TCommentUser tCommentUser) {
+        tCommentUser.setCommentTime(new Date());
         return R.ok(this.tCommentUserService.save(tCommentUser));
     }
 

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

@@ -28,7 +28,7 @@ public class TJsDay extends Model<TJsDay> {
     //升级数
     private Integer upgradeNum;
     //充值
-    private Double recharge;
+    private BigDecimal recharge;
     //技师id
     private String jsId;
     //技师openid
@@ -97,11 +97,11 @@ public class TJsDay extends Model<TJsDay> {
         this.upgradeNum = upgradeNum;
     }
 
-    public Double getRecharge() {
+    public BigDecimal getRecharge() {
         return recharge;
     }
 
-    public void setRecharge(Double recharge) {
+    public void setRecharge(BigDecimal recharge) {
         this.recharge = recharge;
     }
 

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

@@ -238,6 +238,18 @@ public class TOrder implements Serializable {
     @ApiModelProperty("剩余支付时间(秒)")
     private Long remainingTime;
 
+    @TableField(exist = false)
+    @ApiModelProperty("技师昵称")
+    private String cNickName;
+
+    @TableField(exist = false)
+    @ApiModelProperty("技师姓名")
+    private String jsName;
+
+    @TableField(exist = false)
+    @ApiModelProperty("技师手机")
+    private String jsPhone;
+
     @TableField(exist = false)
     @ApiModelProperty("用户信息")
     private TWxUser wxUser;

nightFragrance-massage/src/main/java/com/ylx/massage/mapper/TRechargeMapper.java

@@ -3,6 +3,10 @@ package com.ylx.massage.mapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Mapper;
 import com.ylx.massage.domain.TRecharge;
+import org.apache.ibatis.annotations.Param;
+
+import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 充值记录表 Mapper 接口
@@ -10,4 +14,5 @@ import com.ylx.massage.domain.TRecharge;
 @Mapper
 public interface TRechargeMapper extends BaseMapper<TRecharge> {
 
+    BigDecimal getRecharge(@Param("jsid") String jsid, @Param("startDate") Date startDate, @Param("endDate") Date endDate);
 }

nightFragrance-massage/src/main/java/com/ylx/massage/service/TRechargeService.java

@@ -6,6 +6,7 @@ import com.ylx.massage.domain.TRecharge;
 import com.ylx.massage.domain.TWxUser;
 
 import java.math.BigDecimal;
+import java.util.Date;
 
 /**
  * 充值记录表 服务类
@@ -28,4 +29,6 @@ public interface TRechargeService extends IService<TRecharge> {
      * @return 如果退款成功，返回退款成功的标识字符串；如果失败，返回错误信息字符串。
      */
     String refund(String outRefundNo, String transactionId, String outTradeNo, BigDecimal amount);
+
+    BigDecimal getRecharge(String jsid, Date startDate, Date endDate);
 }

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

@@ -42,6 +42,7 @@ import java.math.BigDecimal;
 import java.security.cert.X509Certificate;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 
@@ -70,6 +71,9 @@ public class TRechargeServiceImpl extends ServiceImpl<TRechargeMapper, TRecharge
     @Autowired
     private WechatAccountConfig wechatAccountConfig;
 
+    @Autowired
+    private TRechargeMapper rechargeMapper;
+
     String serialNo;
 
     @Override
@@ -241,6 +245,11 @@ public class TRechargeServiceImpl extends ServiceImpl<TRechargeMapper, TRecharge
         return null;
     }
 
+    @Override
+    public BigDecimal getRecharge(String jsid, Date startDate, Date endDate) {
+        return rechargeMapper.getRecharge(jsid, startDate, endDate);
+    }
+
     private String getSerialNumber() {
         if (StrUtil.isEmpty(serialNo)) {
             // 获取证书序列号

nightFragrance-massage/src/main/java/com/ylx/massage/task/massageTask.java

@@ -14,6 +14,7 @@ import com.ylx.massage.enums.JsStatusEnum;
 import com.ylx.massage.enums.OrderStatusEnum;
 import com.ylx.massage.service.TJsService;
 import com.ylx.massage.service.TOrderService;
+import com.ylx.massage.service.TRechargeService;
 import com.ylx.massage.service.TSignService;
 import com.ylx.massage.utils.DateTimeUtils;
 import com.ylx.system.service.ISysDeptService;
@@ -47,6 +48,9 @@ public class massageTask {
     @Autowired
     private ISysDeptService deptService;
 
+    @Autowired
+    private TRechargeService rechargeService;
+
 
     public void cancelOrder() {
 
@@ -178,7 +182,6 @@ public class massageTask {
 
             if (CollectionUtil.isNotEmpty(page.getRecords())) {
                 page.getRecords().forEach(sign -> {
-
                     sign.setLayoffTime(endDate);
                     Long layoff = DateTimeUtils.dateToStamp(sign.getLayoffTime());
                     Long sing = DateTimeUtils.dateToStamp(sign.getSingTime());
@@ -207,17 +210,18 @@ public class massageTask {
                     tJsDay.setOpenId(js.getcOpenId());
                     tJsDay.setJsId(js.getId());
                     tJsDay.setName(js.getcName());
-                    Integer onLine =signService.getOnLineTime(js.getId(),startDate,endDate);
+                    Integer onLine = signService.getOnLineTime(js.getId(), startDate, endDate);
                     tJsDay.setOnLine(onLine);
-                    Integer orderNum = orderService.getOrderNum(js.getId(),startDate,endDate);
+                    Integer orderNum = orderService.getOrderNum(js.getId(), startDate, endDate);
                     tJsDay.setOrderNum(orderNum);
-                    Integer addNum = orderService.getAddNum(js.getId(),startDate,endDate);
+                    Integer addNum = orderService.getAddNum(js.getId(), startDate, endDate);
                     tJsDay.setAddNum(addNum);
-                    Integer upgradeNum = orderService.getUpgradeNum(js.getId(),startDate,endDate);
+                    Integer upgradeNum = orderService.getUpgradeNum(js.getId(), startDate, endDate);
                     tJsDay.setUpgradeNum(upgradeNum);
-                    BigDecimal turnover = orderService.getTurnover(js.getId(),startDate,endDate);
+                    BigDecimal turnover = orderService.getTurnover(js.getId(), startDate, endDate);
                     tJsDay.setTurnover(turnover);
-                    tJsDay.setRecharge(0.0);
+                    BigDecimal recharge = rechargeService.getRecharge(js.getId(), startDate, endDate);
+                    tJsDay.setRecharge(recharge);
                 });
             }
         });

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

@@ -76,73 +76,73 @@
 
     <select id="getAll" resultMap="getAllMap">
         select t_order.c_id,
-               t_order.order_no,
-               t_order.atlas_add,
-               t_order.pay_type,
-               t_order.c_js_id,
-               t_order.tape,
-               t_order.fare,
-               t_order.total_price,
-               t_order.parent_no,
-               t_order.c_open_id,
-               t_order.c_goods,
-               t_order.d_total_money,
-               t_order.n_status,
-               t_order.c_address,
-               t_order.c_name,
-               t_order.c_phone,
-               t_order.c_note,
-               t_order.c_time,
-               t_order.timeout_cause,
-               t_order.name,
-               t_order.latitude,
-               t_order.longitude,
-               t_order.address,
-               t_order.c_tj_open_id,
-               t_order.dt_create_time,
-               t_order.acceptance_time,
-               t_order.reach_time,
-               t_order.start_time,
-               t_order.arrival_longitude,
-               t_order.arrival_latitude,
-               t_order.depart_longitude,
-               t_order.depart_latitude,
-               t_order.arrival_photo,
-               t_order.depart_time,
-               t_order.end_time,
-               t_order.reason_refusal,
-               t_js.c_open_id        as jsc_open_id,
-               t_js.c_bh_list        as jsc_bh_list,
-               t_js.c_img_list       as jsc_img_list,
-               t_js.c_sfz_img        as jsc_sfz_img,
-               t_js.n_sex            as jsn_sex,
-               t_js.c_nick_name      as jsc_nick_name,
-               t_js.c_portrait       as jsc_portrait,
-               t_js.c_name           as jsc_name,
-               t_js.c_phone          as jsc_phone,
-               t_js.c_address        as jsc_address,
-               t_js.c_jianjie        as jsc_jianjie,
-               t_js.n_star           as jsn_star,
-               t_js.n_bili           as jsn_bili,
-               t_js.n_num            as jsn_num,
-               t_js.n_status         as jsn_status,
-               t_js.n_status2        as jsn_status2,
-               t_js.n_tong           as jsn_tong,
-               t_js.c_time           as jsc_time,
-               t_js.n_b1             as jsn_b1,
-               t_js.n_b2             as jsn_b2,
-               t_js.n_b3             as jsn_b3,
-               t_js.dt_create_time   as jsdt_create_time,
-               t_wx_user.c_openid    as wxUserc_openid,
-               t_wx_user.c_icon      as wxUsercc_icon,
-               t_wx_user.c_nick_name as wxc_nick_name
+        t_order.order_no,
+        t_order.atlas_add,
+        t_order.pay_type,
+        t_order.c_js_id,
+        t_order.tape,
+        t_order.fare,
+        t_order.total_price,
+        t_order.parent_no,
+        t_order.c_open_id,
+        t_order.c_goods,
+        t_order.d_total_money,
+        t_order.n_status,
+        t_order.c_address,
+        t_order.c_name,
+        t_order.c_phone,
+        t_order.c_note,
+        t_order.c_time,
+        t_order.timeout_cause,
+        t_order.name,
+        t_order.latitude,
+        t_order.longitude,
+        t_order.address,
+        t_order.c_tj_open_id,
+        t_order.dt_create_time,
+        t_order.acceptance_time,
+        t_order.reach_time,
+        t_order.start_time,
+        t_order.arrival_longitude,
+        t_order.arrival_latitude,
+        t_order.depart_longitude,
+        t_order.depart_latitude,
+        t_order.arrival_photo,
+        t_order.depart_time,
+        t_order.end_time,
+        t_order.reason_refusal,
+        t_js.c_open_id as jsc_open_id,
+        t_js.c_bh_list as jsc_bh_list,
+        t_js.c_img_list as jsc_img_list,
+        t_js.c_sfz_img as jsc_sfz_img,
+        t_js.n_sex as jsn_sex,
+        t_js.c_nick_name as jsc_nick_name,
+        t_js.c_portrait as jsc_portrait,
+        t_js.c_name as jsc_name,
+        t_js.c_phone as jsc_phone,
+        t_js.c_address as jsc_address,
+        t_js.c_jianjie as jsc_jianjie,
+        t_js.n_star as jsn_star,
+        t_js.n_bili as jsn_bili,
+        t_js.n_num as jsn_num,
+        t_js.n_status as jsn_status,
+        t_js.n_status2 as jsn_status2,
+        t_js.n_tong as jsn_tong,
+        t_js.c_time as jsc_time,
+        t_js.n_b1 as jsn_b1,
+        t_js.n_b2 as jsn_b2,
+        t_js.n_b3 as jsn_b3,
+        t_js.dt_create_time as jsdt_create_time,
+        t_wx_user.c_openid as wxUserc_openid,
+        t_wx_user.c_icon as wxUsercc_icon,
+        t_wx_user.c_nick_name as wxc_nick_name
         from t_order
-                 left join
-             t_js on
-                 t_order.c_js_id = t_js.id
-                 left join
-             t_wx_user on
-                 t_wx_user.c_openid = t_order.c_open_id
+        left join
+        t_js on
+        t_order.c_js_id = t_js.id
+        left join
+        t_wx_user on
+        t_wx_user.c_openid = t_order.c_open_id
         <where>
             t_order.is_delete = 0 and t_js.is_delete = 0 and t_wx_user.is_delete = 0
             <if test="param.cId != null and param.cId != ''">
@@ -151,6 +151,18 @@
             <if test="param.cName != null and param.cName != ''">
                 and t_order.c_name like concat('%',#{param.cName},'%')
             </if>
+            <if test="param.cNickName != null and param.cNickName != ''">
+                and t_js.c_nick_name like concat('%',#{param.cNickName},'%')
+            </if>
+            <if test="param.jsName != null and param.jsName != ''">
+                and t_js.c_name like concat('%',#{param.jsName},'%')
+            </if>
+            <if test="param.jsPhone != null and param.jsPhone != ''">
+                and t_js.c_phone like concat('%',#{param.jsPhone},'%')
+            </if>
+            <if test="param.cPhone != null and param.cPhone != ''">
+                and t_order.c_phone = #{cPhone}
+            </if>
             <if test="param.orderNo != null and param.orderNo != ''">
                 and t_order.order_no = #{ param.orderNo }
             </if>
@@ -171,51 +183,40 @@
             </if>
         </where>
         order by
-            t_order.dt_create_time desc
+        t_order.dt_create_time desc
     </select>
     <select id="getOrderNum" resultType="java.lang.Integer">
-        SELECT
-            count( 1 )
-        FROM
-            t_order
-        WHERE
-            is_delete = 0
+        SELECT count(1)
+        FROM t_order
+        WHERE is_delete = 0
           AND c_js_id = #{jsid}
           AND end_time BETWEEN #{startDate} AND #{endDate}
-          AND n_status in(4,5)
+          AND n_status in (4, 5)
     </select>
     <select id="getAddNum" resultType="java.lang.Integer">
-        SELECT
-            count( 1 )
-        FROM
-            t_order
-        WHERE
-            is_delete = 0
+        SELECT count(1)
+        FROM t_order
+        WHERE is_delete = 0
           AND c_js_id = #{jsid}
           AND end_time BETWEEN #{startDate} AND #{endDate}
-          AND n_status in(4,5) and order_type = 1
+          AND n_status in (4, 5)
+          and order_type = 1
     </select>
     <select id="getUpgradeNum" resultType="java.lang.Integer">
-        SELECT
-            count( 1 )
-        FROM
-            t_order
-        WHERE
-            is_delete = 0
+        SELECT count(1)
+        FROM t_order
+        WHERE is_delete = 0
           AND c_js_id = #{jsid}
           AND end_time BETWEEN #{startDate} AND #{endDate}
-          AND n_status in(4,5) and order_type = 2
+          AND n_status in (4, 5)
+          and order_type = 2
     </select>
-
-    <select id="getTurnover">
-        SELECT
-            sum(total_price)
-        FROM
-            t_order
-        WHERE
-            is_delete = 0
+    <select id="getTurnover" resultType="java.math.BigDecimal">
+        SELECT sum(total_price)
+        FROM t_order
+        WHERE is_delete = 0
           AND c_js_id = #{jsid}
           AND end_time BETWEEN #{startDate} AND #{endDate}
-          AND n_status in(4,5)
+          AND n_status in (4, 5)
     </select>
 </mapper>

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

@@ -15,5 +15,14 @@
     <sql id="Base_Column_List">
         c_id, c_open_id, d_money, dt_create_time
     </sql>
+    <select id="getRecharge" resultType="java.math.BigDecimal">
+        SELECT IFNULL(sum(d_money), 0) recharge
+        FROM t_recharge
+        WHERE is_delete = 0
+          AND js_id = #{jsid}
+          AND dt_create_time BETWEEN #{startDate}
+          AND #{endDate}
+          AND pay_status in (1)
+    </select>
 
 </mapper>