积分商城13

jyy

2021-03-22 a17a3616fb0b59d61cda0f97c5005c18d97cdbee

积分商城13

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreUseRecord.java

@@ -25,7 +25,7 @@
     */


    private Integer  recType;
    private Integer  type;
    
    /**
     * 数量

 zq-erp/src/main/java/com/matrix/system/score/entity/ScoreVipDetail.java

@@ -99,7 +99,7 @@
     */


    private String  businessId;
    private Long  businessId;
    
    /**
     * 所属公司_id

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

@@ -152,6 +152,7 @@
        scoreVipDetail.setState(ScoreVipDetail.SCORE_STATUS_YX);
        scoreVipDetail.setRemainScore(score);
        scoreVipDetail.setUsedScore(0);
        scoreVipDetail.setBusinessId(businessId);
        scoreVipDetail.setValiditeTime(sxys);
        scoreVipDetail.setOpenId(openId);
        scoreVipDetail.setVipId(vipId);
@@ -173,7 +174,7 @@
        scoreUseRecord.setScoreVipDetailId(scoreVipDetail.getId());
        scoreUseRecord.setBusinessId(businessId);
        scoreUseRecord.setRecNum(score);
        scoreUseRecord.setRecType(type);
        scoreUseRecord.setType(type);
        scoreUseRecord.setOpenId(openId);
        scoreUseRecord.setVipId(vipId);
        scoreUseRecord.setShopId(shopId);

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

@@ -52,12 +52,13 @@
            scoreVipDetailService.deductionScore(order.getUserId(),null,Long.parseLong(order.getStoreId()+""),order.getScorePay(),Long.parseLong(order.getId()+""), ScoreVipDetail.SCORE_VIP_TYPE_CASH);
        }
        //消费获得积分
        orderDetails.forEach(shopOrderDetail -> {
            int addScore=0;
        for(ShopOrderDetails shopOrderDetail : orderDetails) {
            if(shopOrderDetail.getPayType()==ShopOrderDetails.PAYTYPE_MICRO){
              Integer xfkdScore=  shopOrderDetail.getShopSku().getScore();
              if(xfkdScore!=null && xfkdScore>0){
                  addScore+=xfkdScore;
              }
              }
            }
            if(addScore>0){
@@ -71,7 +72,6 @@
                        ScoreVipDetail.SCORE_VIP_TYPE_CASH,
                        "微商城消费");
            }
        });

    }