修改bug

Pu Zhibing

2024-11-09 f85ea638d98b302c590e65f00e6912d91601613c

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/general/UserActivityController.java

@@ -21,6 +21,7 @@
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;

import java.math.BigDecimal;
import java.text.SimpleDateFormat;
import java.util.Date;
import java.util.HashMap;
@@ -151,9 +152,20 @@
            map.put("userActivityInviteUseMoney",0);
        }
        if(SinataUtil.isNotEmpty(userActivityDiscount1)){
            // 专车
            Map<String,Object> resultMap = userCouponRecordService.getDiscountStatic(startTimes,endTimes,userActivityDiscount1.getId());
            map.put("userActivityDiscount1Money",resultMap.get("money"));
            map.put("userActivityDiscount1Number",resultMap.get("number"));
            BigDecimal bigDecimal = new BigDecimal(resultMap.get("money").toString());
            String string = resultMap.get("number").toString();
            Integer i = Integer.valueOf(string);
            // 小件物流
            Map<String,Object> resultMap1 = userCouponRecordService.getDiscountStatic1(startTimes,endTimes,userActivityDiscount1.getId());
            BigDecimal bigDecimal1 = new BigDecimal(resultMap1.get("money").toString());
            String string1 = resultMap1.get("number").toString();
            Integer i1 = Integer.valueOf(string1);
            BigDecimal add = bigDecimal.add(bigDecimal1);
            i +=i1;
            map.put("userActivityDiscount1Money",add);
            map.put("userActivityDiscount1Number",i);
        }else{
            map.put("userActivityDiscount1Money",0);
            map.put("userActivityDiscount1Number",0);