Merge remote-tracking branch 'origin/dev' into dev

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/IntegralUserRecordBiz.java

@@ -24,6 +24,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 @Service
@@ -65,8 +66,8 @@ public class IntegralUserRecordBiz extends BaseBiz<IntegralUserRecordMapper, Int
         if (integralUserRecord.getPoint() == null) {
             Integer point = 0;
             if (oldValue.getPoint() == 0) {//没有基础分需要计算分数
-                //Integer amount = Integer.parseInt(new BigDecimal(integralUserRecord.getAmount()).divide(new BigDecimal("100"), 0, BigDecimal.ROUND_DOWN).toString());
-                Integer amount = Integer.parseInt(integralUserRecord.getAmount());
+                Integer amount = Integer.parseInt(new BigDecimal(integralUserRecord.getAmount()).divide(new BigDecimal("100"), 0, BigDecimal.ROUND_DOWN).toString());
+                //Integer amount = Integer.parseInt(integralUserRecord.getAmount());
                 JSONObject jsonObject = JSONObject.parseObject(oldValue.getOtherRule());
                 log.info("查询的其他规则json信息：jsonObject = {}", jsonObject);
                 if (jsonObject == null) {