充值和消费加消费状态处理

src/main/java/com/usky/dxtop/controller/web/ChargeController.java

@@ -2,6 +2,7 @@ package com.usky.dxtop.controller.web;
 
 
 import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.model.Charge;
 import com.usky.dxtop.service.ChargeService;
 import com.usky.dxtop.service.vo.ChargeRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,5 +50,9 @@ public class ChargeController {
     }
 
 
+    @PutMapping
+    public AjaxResult update(@RequestBody Charge charge){
+        return AjaxResult.success(chargeService.update(charge));
+    }
 }
 

src/main/java/com/usky/dxtop/controller/web/DishController.java

@@ -2,6 +2,7 @@ package com.usky.dxtop.controller.web;
 
 
 import com.usky.dxtop.common.core.domain.AjaxResult;
+import com.usky.dxtop.model.Dish;
 import com.usky.dxtop.service.DishService;
 import com.usky.dxtop.service.vo.DishRequest;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -55,6 +56,10 @@ public class DishController {
     }
 
 
+    @PutMapping
+    public AjaxResult update(@RequestBody Dish dish){
+        return AjaxResult.success(dishService.update(dish));
+    }
 
 }
 

src/main/java/com/usky/dxtop/framework/config/SecurityConfig.java

@@ -100,7 +100,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                 // 对于登录login 注册register 验证码captchaImage 允许匿名访问
                 .antMatchers("/login", "/register", "/captchaImage","/top/notify","/dxtop/order/topScanPayApi","/loginApi",
                         "/dxtop/charge/page","/dxtop/dish/page","/wxLogin","/wxAccToken","/dxtop/order/callUnifiedPay",
-                        "/dxtop/staff/one","/dxtop/staff/cardBalance","/dxtop/msglog/one","/dxtop/charge/cordPage"
+                        "/dxtop/staff/one","/dxtop/staff/cardBalance","/dxtop/msglog/one","/dxtop/charge/cordPage","/dxtop/charge","/dxtop/dish"
                         ).permitAll()
                 .antMatchers(
                         HttpMethod.GET,

src/main/java/com/usky/dxtop/mapper/ChargeMapper.java

@@ -35,7 +35,8 @@ public interface ChargeMapper extends BaseMapper<Charge> {
                       @Param("endTime")Date endTime,
                       @Param("cart")String cart,
                       @Param("userName")String userName,
-                      @Param("userId")String userId);
+                      @Param("userId")String userId,
+                      @Param("messageFlag")Boolean messageFlag);
 
 
     /**
@@ -52,6 +53,7 @@ public interface ChargeMapper extends BaseMapper<Charge> {
                           @Param("endTime")Date endTime,
                           @Param("cart")String cart,
                           @Param("userName")String userName,
-                          @Param("userId")String userId);
+                          @Param("userId")String userId,
+                                      @Param("messageFlag")Boolean messageFlag);
 
 }

src/main/java/com/usky/dxtop/mapper/DishMapper.java

@@ -34,5 +34,6 @@ public interface DishMapper extends BaseMapper<Dish> {
                       @Param("endTime")Date endTime,
                       @Param("cart")String cart,
                       @Param("userName")String userName,
-                        @Param("userId")String userId);
+                        @Param("userId")String userId,
+                    @Param("messageFlag")Boolean messageFlag);
 }

src/main/java/com/usky/dxtop/model/Charge.java

@@ -93,6 +93,9 @@ public class Charge implements Serializable {
      */
     @TableField(exist = false)
     private String userPhone;
-
+    /**
+     * 消息状态
+     */
+    private Boolean messageFlag;
 
 }

src/main/java/com/usky/dxtop/model/Dish.java

@@ -113,4 +113,8 @@ public class Dish implements Serializable {
     private String userPhone;
 
 
+    /**
+     * 消息状态
+     */
+    private Boolean messageFlag;
 }

src/main/java/com/usky/dxtop/service/ChargeService.java

@@ -33,4 +33,11 @@ public interface ChargeService extends IService<Charge> {
      * @return
      */
     Charge one(Long seq);
+
+    /**
+     * 修改
+     * @param charge
+     * @return
+     */
+    Boolean update(Charge charge);
 }

src/main/java/com/usky/dxtop/service/DishService.java

@@ -38,4 +38,11 @@ public interface DishService extends IService<Dish> {
      */
     Map<String,Object> collect();
 
+    /**
+     * 修改
+     * @param dish
+     * @return
+     */
+    Boolean update(Dish dish);
+
 }

src/main/java/com/usky/dxtop/service/impl/ChargeServiceImpl.java

@@ -28,7 +28,7 @@ public class ChargeServiceImpl extends ServiceImpl<ChargeMapper, Charge> impleme
         IPage<Charge> page = new Page<>(chargeRequest.getCurrent(), chargeRequest.getSize());
         page = baseMapper.page(page,chargeRequest.getStartTime(),
                 chargeRequest.getEndTime(),chargeRequest.getCart(),
-                chargeRequest.getNameOrPhone(),chargeRequest.getUserId()
+                chargeRequest.getNameOrPhone(),chargeRequest.getUserId(),chargeRequest.getMessageFlag()
         );
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());
     }
@@ -38,7 +38,7 @@ public class ChargeServiceImpl extends ServiceImpl<ChargeMapper, Charge> impleme
         IPage<Map<String,Object>> page = new Page<>(chargeRequest.getCurrent(), chargeRequest.getSize());
         page = baseMapper.cordPage(page,chargeRequest.getStartTime(),
                 chargeRequest.getEndTime(),chargeRequest.getCart(),
-                chargeRequest.getNameOrPhone(),chargeRequest.getUserId()
+                chargeRequest.getNameOrPhone(),chargeRequest.getUserId(),chargeRequest.getMessageFlag()
         );
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());
     }
@@ -47,4 +47,9 @@ public class ChargeServiceImpl extends ServiceImpl<ChargeMapper, Charge> impleme
     public Charge one(Long seq) {
         return this.getById(seq);
     }
+
+    @Override
+    public Boolean update(Charge charge) {
+        return this.updateById(charge);
+    }
 }

src/main/java/com/usky/dxtop/service/impl/DishServiceImpl.java

@@ -31,7 +31,7 @@ public class DishServiceImpl extends ServiceImpl<DishMapper, Dish> implements Di
     public CommonPage<Dish> page(DishRequest dishRequest) {
         IPage<Dish> page = new Page<>(dishRequest.getCurrent(), dishRequest.getSize());
         page = baseMapper.page(page,dishRequest.getStartTime(),dishRequest.getEndTime(),dishRequest.getCart(),
-                dishRequest.getNameOrPhone(),dishRequest.getUserId());
+                dishRequest.getNameOrPhone(),dishRequest.getUserId(),dishRequest.getMessageFlag());
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());
     }
 
@@ -49,5 +49,10 @@ public class DishServiceImpl extends ServiceImpl<DishMapper, Dish> implements Di
         return this.getMap(queryWrapper);
     }
 
+    @Override
+    public Boolean update(Dish dish) {
+        return this.updateById(dish);
+    }
+
 
 }

src/main/java/com/usky/dxtop/service/vo/ChargeRequest.java

@@ -46,4 +46,9 @@ public class ChargeRequest {
      * 用戶id
      */
     private String userId;
+
+    /**
+     * 已读状态
+     */
+    private Boolean messageFlag;
 }

src/main/java/com/usky/dxtop/service/vo/DishRequest.java

@@ -45,4 +45,8 @@ public class DishRequest {
      * 用戶id
      */
     private String userId;
+    /**
+     * 已读状态
+     */
+    private Boolean messageFlag;
 }

src/main/resources/mapper/ChargeMapper.xml

@@ -34,15 +34,18 @@
             <if test="userId != null">
                 and s.id = #{userId}
             </if>
+            <if test="messageFlag != null">
+                and ch.message_flag = #{messageFlag}
+            </if>
         </where>
         order by ch.create_time desc
     </select>
     <select id="cordPage" resultType="java.util.Map">
         select dc.*,s.name as userName,s.contacts as userPhone FROM(
-        SELECT create_time as createTime,card, amt,balance, '充值' as 'cord',type,shop_name as shopName
+        SELECT create_time as createTime,card, amt,balance, '充值' as 'cord',type,shop_name as shopName,message_flag as messageFlag,seq
         FROM charge
         UNION all
-        SELECT create_time as createTime,card, amt,balance, '消费' as 'cord',type,shop_name as shopName
+        SELECT create_time as createTime,card, amt,balance, '消费' as 'cord',type,shop_name as shopName,message_flag as messageFlag,seq
         FROM dish)
         as dc
         left join staff as s on dc.card = s.card_id
@@ -61,6 +64,9 @@
             <if test="cart !=null and cart !=''">
                 and dc.card = #{cart}
             </if>
+            <if test="messageFlag != null">
+                and dc.messageFlag = #{messageFlag}
+            </if>
         </where>
         order by createTime desc
     </select>

src/main/resources/mapper/DishMapper.xml

@@ -37,6 +37,9 @@
             <if test="userId != null">
                 and s.id = #{userId}
             </if>
+            <if test="messageFlag != null">
+                and d.message_flag = #{messageFlag}
+            </if>
         </where>
         order by d.create_time desc
     </select>