fix money-card-flow

Helius

2021-12-30 c197ea1f3078de4d4c0e753c8a54caca5b9d5bc2

fix money-card-flow

 zq-erp/src/main/java/com/matrix/system/hive/action/MoneyCardUseController.java

@@ -116,6 +116,10 @@
    @RequestMapping(value = "/showCardFlowList")
    public @ResponseBody
    AjaxResult showCardFlowList(MoneyCardUseFlow moneyCardUseFlow, PaginationVO pageVo) {
        MoneyCardUse vipCard = cardUseService.findByVipId(moneyCardUseFlow.getVipId());
        if (vipCard != null) {
            moneyCardUseFlowDao.updateVipCardId(moneyCardUseFlow.getVipId(), vipCard.getId());
        }
        List<MoneyCardUseFlow> dataList = moneyCardUseFlowDao.selectInPage(moneyCardUseFlow, pageVo);
        return AjaxResult.buildSuccessInstance(dataList, moneyCardUseFlowDao.selectTotalRecord(moneyCardUseFlow));
    }

 zq-erp/src/main/java/com/matrix/system/hive/dao/MoneyCardUseFlowDao.java

@@ -33,5 +33,7 @@
    public int  selectTotalRecord(@Param("record") MoneyCardUseFlow moneyCardUseFlow);
    
    public MoneyCardUseFlow  selectById(Long id);

    int updateVipCardId(@Param("vipId") Long vipId, @Param("cardId") Long cardId);
    
}

 zq-erp/src/main/java/com/matrix/system/hive/service/imp/SysOrderServiceImpl.java

@@ -1520,6 +1520,7 @@
        moneyCardUseFlow.setCreateTime(new Date());
        moneyCardUseFlow.setOperationId(user.getSuId());
        moneyCardUseFlow.setBalance(cardUser.getGiftMoney() + cardUser.getRealMoney());
        moneyCardUseFlow.setCarUseId(cardUser.getId());
        moneyCardUseFlowDao.insert(moneyCardUseFlow);

        order.setFlows(czVo.getFlows());

 zq-erp/src/main/resources/mybatis/mapper/hive/MoneyCardUseFlowDao.xml

@@ -360,6 +360,12 @@
        </where>
        order by  create_time desc
    </select>

    <update id="updateVipCardId">
        update money_card_use_flow
            set car_use_id=#{cardId}
        where vip_id=#{vipId} and type='会员充值'
    </update>
</mapper>

        

 zq-erp/src/main/resources/templates/views/admin/hive/beautySalon/vip.html

@@ -1117,7 +1117,7 @@
                    title : "充值卡变更记录",
                    area : MUI.SIZE_M,
                    maxmin : true,
                    content : [ basePath + "/admin/redirect/hive/vip/moneyCardUseFlow-list?vipId=" + row.vipId ]
                    content : [ basePath + "/admin/redirect/hive/vip/moneyCardUseFlow-list?vipId=" + row.vipId + "&cardId=" + row.id ]
                });
            },


 zq-erp/src/main/resources/templates/views/admin/hive/vip/moneyCardUseFlow-list.html

@@ -21,6 +21,7 @@
        <form class="form-inline" id="serchform2">
            <!-- 用于套餐的查询 -->
            <input autocomplete="off"   type="hidden" name="vipId" th:value="${param.vipId}" class="vipId">
            <input autocomplete="off" type="hidden" name="carUseId" th:value="${param.cardId}" />
        </form>
    </div>
    <div class="row mt-10">