积分商城15

jyy

2021-03-22 c6a93bdf8cee5ac0878fa772b6362c499c62795f

积分商城15

 zq-erp/src/main/java/com/matrix/system/score/service/ScoreVipDetailService.java

@@ -54,7 +54,7 @@
     * 扣除用户积分
     */
    @Transactional(rollbackFor = Exception.class)
    public void deductionScore(String openId, Long vipId,Long shopId, Integer score, Long businessId, int type) {
    public void deductionScore(String openId, Long vipId,Long shopId, Integer score, Long businessId, int type,String remark) {
        Long companyId=null;
        if(openId!=null){
            companyId= bizUserDao.findByOpenId(openId).getCompanyId();
@@ -103,6 +103,7 @@
            scoreUseRecord.setShopId(shopId);
            scoreUseRecord.setOpenId(openId);
            scoreUseRecord.setVipId(vipId);
            scoreUseRecord.setRemarks(remark);
            scoreUseRecordDao.insert(scoreUseRecord);

            if(surplus > 0 || surplus == 0){

 zq-erp/src/main/java/com/matrix/system/shopXcx/mqTask/ScoreOrderTask.java

@@ -48,8 +48,8 @@
        List<ShopOrderDetails> orderDetails = shopOrderDetailsDao.selectByOrderId(Integer.valueOf(orderId));
        order.setDetails(orderDetails);
        //扣除积分
        if(order.getScorePay()!=null){
            scoreVipDetailService.deductionScore(order.getUserId(),null,Long.parseLong(order.getStoreId()+""),order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
        if(order.getScorePay()!=null&&order.getScorePay()>0){
            scoreVipDetailService.deductionScore(order.getUserId(),null,Long.parseLong(order.getStoreId()+""),order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH,"商城积分抵扣");
        }else{
            //消费获得积分
            int addScore=0;