Merge remote-tracking branch 'origin/master'

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/basics/service/impl/PtMealtypeServiceImpl.java

@@ -81,6 +81,7 @@ public class PtMealtypeServiceImpl implements IPtMealtypeService {
         lqw.like(StringUtils.isNotBlank(bo.getMealName()), PtMealType::getMealName, bo.getMealName());
         lqw.ge(StringUtils.isNotBlank(bo.getBeginTime()), PtMealType::getBeginTime, bo.getBeginTime());
         lqw.le(StringUtils.isNotBlank(bo.getEndTime()), PtMealType::getEndTime, bo.getEndTime());
+        lqw.orderByAsc(PtMealType::getTypeId);
         return lqw;
     }
 

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/business/errfill/ErrFillBusiness.java

@@ -78,7 +78,7 @@ public class ErrFillBusiness {
         PtMealTypeVo mealTypeVo = list.get(4) == null ? new PtMealTypeVo() : (PtMealTypeVo) list.get(4);
 
         log.info("[验证通过,开始写入消费明细数据]-[{}]", JSONUtil.toJsonStr(bo));
-        String remark = MessageFormat.format("[错误补款]-[{0}]", JSONUtil.toJsonStr(bo));
+        String remark = MessageFormat.format("[错扣补款]-[{0}]", JSONUtil.toJsonStr(bo));
         XfConsumeDetailVo consumeDetailVo = createConsumeRecord(bo, userAccountVo, cardVo, bagVo, termVo, mealTypeVo,remark);
         if (consumeDetailVo == null) {
             message = MessageFormat.format("[错扣补款]->[写消费明细表失败]-[{0}]", JSONUtil.toJsonStr(bo));
@@ -148,6 +148,10 @@ public class ErrFillBusiness {
         consumeDetailBo.setMealName(mealTypeVo.getMealName());
         //设置钱包信息
         consumeDetailBo.setBagType(bagVo.getBagCode());
+        //错扣补款设置statusFlag为0
+        consumeDetailBo.setStatusFlag(0L);
+        //将需要补款的消费记录Id记入原始消费Id,以便追查消费记录是否有补扣以及对应的补扣记录
+        consumeDetailBo.setOriginalId(bo.getConsumeId());
         consumeDetailBo.setRemark(remark);
 
         return consumeDetailService.createConsumeDetailRecord(consumeDetailBo);
@@ -162,10 +166,11 @@ public class ErrFillBusiness {
      */
     private XfUserTotalVo createOrUpdateUserTotal(ConsumptionBo bo, PtUserAccountVo accountVo, PtCardVo cardVo) {
         XfUserTotalBo xfUserTotalBo = new XfUserTotalBo();
-        xfUserTotalBo.setUserId(accountVo.getUserId());
-        xfUserTotalBo.setUserNumb(accountVo.getUserNumb());
-        xfUserTotalBo.setRealName(accountVo.getRealName());
-        xfUserTotalBo.setDeptName(accountVo.getDeptName());
+        BeanUtil.copyProperties(accountVo, xfUserTotalBo);
+        //xfUserTotalBo.setUserId(accountVo.getUserId());
+        //xfUserTotalBo.setUserNumb(accountVo.getUserNumb());
+        //xfUserTotalBo.setRealName(accountVo.getRealName());
+        //xfUserTotalBo.setDeptName(accountVo.getDeptName());
         xfUserTotalBo.setCardNo(cardVo.getCardNo());
         xfUserTotalBo.setDateDay(DateUtil.format(new Date(), "yyyy-MM-dd"));
         xfUserTotalBo.setUseType(bo.getUseType().code());

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/controller/XfTermController.java

@@ -56,6 +56,15 @@ public class XfTermController extends BaseController {
         return xfTermService.queryPageList(bo, pageQuery);
     }
 
+    /**
+     * 查询消费设备列表
+     */
+    @SaCheckPermission("consumption:xfTerm:list")
+    @GetMapping("/all")
+    public R<List<XfTermVo>> listAll(XfTermBo bo) {
+        return R.ok(xfTermService.queryList(bo));
+    }
+
     /**
      * 导出消费设备列表
      */

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/domain/bo/ConsumptionBo.java

@@ -71,7 +71,11 @@ public class ConsumptionBo extends BaseEntity {
      */
     @NotNull(message = "消费餐类不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long mealType;
-
+    /**
+     * 餐类Id
+     */
+    @NotNull(message = "消费记录Id不能为空", groups = { AddGroup.class, EditGroup.class })
+    private String consumeId;
     /**
      * 系统使用类型
      */
@@ -84,6 +88,7 @@ public class ConsumptionBo extends BaseEntity {
      * 操作员姓名
      */
     private String operatorName;
+
     //endregion
 
     //region 错扣补款属性

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfConsumeDetailServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.RequiredArgsConstructor;
 import org.dromara.backstage.consumption.domain.XfConsumeDetail;
+import org.dromara.backstage.consumption.domain.XfTerm;
 import org.dromara.backstage.consumption.domain.bo.XfConsumeDetailBo;
 import org.dromara.backstage.consumption.domain.vo.XfConsumeDetailVo;
 import org.dromara.backstage.consumption.mapper.XfConsumeDetailMapper;
@@ -106,6 +107,9 @@ public class XfConsumeDetailServiceImpl implements IXfConsumeDetailService {
         lqw.eq(bo.getRecordStatus() != null, XfConsumeDetail::getRecordStatus, bo.getRecordStatus());
         lqw.eq(bo.getSyncStatus() != null, XfConsumeDetail::getSyncStatus, bo.getSyncStatus());
 
+        lqw.between(params.get("beginTime") != null && params.get("endTime") != null,
+            XfConsumeDetail::getConsumeDate, params.get("beginTime"), params.get("endTime"));
+
         lqw.orderByDesc(XfConsumeDetail::getConsumeDate);
 
         return lqw;

ruoyi-modules/ruoyi-backstage/src/main/java/org/dromara/backstage/consumption/service/impl/XfTermServiceImpl.java

@@ -142,6 +142,8 @@ public class XfTermServiceImpl implements IXfTermService {
         lqw.eq(bo.getTermNo() != null, XfTerm::getTermNo, bo.getTermNo());
         lqw.like(StringUtils.isNotBlank(bo.getTermName()), XfTerm::getTermName, bo.getTermName());
         lqw.eq(StringUtils.isNotBlank(bo.getTermIp()), XfTerm::getTermIp, bo.getTermIp());
+
+        lqw.orderByAsc(XfTerm::getTermName);
         return lqw;
     }