充值和消费余额修复

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

@@ -32,6 +32,12 @@ public class ChargeController {
         return AjaxResult.success(chargeService.page(chargeRequest));
     }
 
+
+    @PostMapping("/cordPage")
+    public AjaxResult cordPage(@Validated @RequestBody ChargeRequest chargeRequest){
+        return AjaxResult.success(chargeService.cordPage(chargeRequest));
+    }
+
     /**
      * 充值详情
      * @param seq

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/staff/one","/dxtop/staff/cardBalance","/dxtop/msglog/one","/dxtop/charge/cordPage"
                         ).permitAll()
                 .antMatchers(
                         HttpMethod.GET,

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

@@ -7,6 +7,7 @@ import com.usky.dxtop.model.Charge;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.Date;
+import java.util.Map;
 
 
 /**
@@ -35,4 +36,22 @@ public interface ChargeMapper extends BaseMapper<Charge> {
                       @Param("cart")String cart,
                       @Param("userName")String userName,
                       @Param("userId")String userId);
+
+
+    /**
+     * 分页
+     * @param page
+     * @param startTime
+     * @param endTime
+     * @param cart
+     * @param userName
+     * @return
+     */
+    Page<Map<String,Object>> cordPage(IPage<Map<String,Object>> page,
+                          @Param("startTime") Date startTime,
+                          @Param("endTime")Date endTime,
+                          @Param("cart")String cart,
+                          @Param("userName")String userName,
+                          @Param("userId")String userId);
+
 }

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

@@ -5,6 +5,8 @@ import com.usky.dxtop.common.core.page.CommonPage;
 import com.usky.dxtop.model.Charge;
 import com.usky.dxtop.service.vo.ChargeRequest;
 
+import java.util.Map;
+
 
 /**
  * <p>
@@ -22,6 +24,9 @@ public interface ChargeService extends IService<Charge> {
      */
     CommonPage<Charge> page(ChargeRequest chargeRequest);
 
+
+    CommonPage<Map<String,Object>> cordPage(ChargeRequest chargeRequest);
+
     /**
      * 充值详情
      * @param seq

src/main/java/com/usky/dxtop/service/emun/OrderSceneCode.java

@@ -10,11 +10,11 @@ public enum OrderSceneCode {
 
     VISITOR(2,"游客充值"),
 
-    ERP_APP(3,"ERPapp充值"),
+    ERP_APP(3,"ERPAPP充值"),
 
     COMMON_APP(4,"通用app自主充值"),
 
-    WX_ACCOUNTS(6,"通用app自主充值"),
+    WX_ACCOUNTS(6,"公众号充值"),
 
 
     OTHER(5,"其它");

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

@@ -10,6 +10,8 @@ import com.usky.dxtop.service.ChargeService;
 import com.usky.dxtop.service.vo.ChargeRequest;
 import org.springframework.stereotype.Service;
 
+import java.util.Map;
+
 /**
  * <p>
  *  服务实现类
@@ -31,6 +33,16 @@ public class ChargeServiceImpl extends ServiceImpl<ChargeMapper, Charge> impleme
         return new CommonPage<>(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());
     }
 
+    @Override
+    public CommonPage<Map<String, Object>> cordPage(ChargeRequest chargeRequest) {
+        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()
+        );
+        return new CommonPage<>(page.getRecords(),page.getTotal(),page.getSize(),page.getCurrent());
+    }
+
     @Override
     public Charge one(Long seq) {
         return this.getById(seq);

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

@@ -75,7 +75,7 @@ public class StaffServiceImpl extends ServiceImpl<StaffMapper, Staff> implements
     public BigDecimal getBalance(String card) {
         Staff staff = this.one(null, null, card);
         Optional.ofNullable(staff).orElseThrow(() -> new CustomException("用户信息不存在"));
-        return  staff.getBalance();
+        return Optional.ofNullable(staff.getBalance()).orElse(new BigDecimal("0.00"));
     }
 
     @Override

src/main/resources/mapper/ChargeMapper.xml

@@ -37,5 +37,33 @@
         </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
+        FROM charge
+        UNION all
+        SELECT create_time as createTime,card, amt,balance, '消费' as 'cord',type,shop_name as shopName
+        FROM dish)
+        as dc
+        left join staff as s on dc.card = s.card_id
+        <where>
+            <if test="startTime != null and endTime != null">
+                and  dc.createTime between #{startTime}
+                and #{endTime}
+            </if>
+            <if test="userName !=null and userName !=''">
+                and user_name like CONCAT('%',#{userName},'%')
+                or user_account like CONCAT('%',#{userName},'%')
+            </if>
+            <if test="userId != null">
+                and s.id = #{userId}
+            </if>
+            <if test="cart !=null and cart !=''">
+                and dc.card = #{cart}
+            </if>
+        </where>
+        order by createTime desc
+    </select>
+
 
 </mapper>