修改bug

zhibing.pu

2024-08-10 2de067f6cf8476943560db90264c1ea09f609a6f

修改bug

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

@@ -144,6 +144,8 @@
    public Object immediately(@RequestParam Integer id,@RequestParam Integer state,@RequestParam String remark) {
        TPubWithdrawal tPubWithdrawal = tPubWithdrawalService.selectById(id);
        if (SinataUtil.isNotEmpty(tPubWithdrawal)){
            TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
            Integer language = tDriver.getLanguage();
            tPubWithdrawal.setRemark(remark);

            String serviceCode = "";
@@ -153,7 +155,6 @@
                serviceCode = tUser.getPhoneOperator();
                phone = tUser.getPhone();
            }else{
                TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
                serviceCode = tDriver.getPhoneOperator();
                phone = tDriver.getPhone();
            }
@@ -180,7 +181,6 @@
                    tUser.setBalance(tUser.getBalance().add(tPubWithdrawal.getMoney()));
                    userService.updateById(tUser);
                }else{
                    TDriver tDriver = driverService.selectById(tPubWithdrawal.getUserId());
                    tDriver.setBalance(tDriver.getBalance().add(tPubWithdrawal.getMoney()));
                    if(tPubWithdrawal.getType() == 1){//活动提现
                        tDriver.setLaveActivityMoney(new BigDecimal(tDriver.getLaveActivityMoney()).add(tPubWithdrawal.getMoney()).setScale(2, RoundingMode.HALF_EVEN).doubleValue());
@@ -197,7 +197,7 @@
            TSystemNotice notice = new TSystemNotice();
            notice.setType(2);
            notice.setUserType(tPubWithdrawal.getUserType());
            notice.setContent("提现处理结果:【"+remark+"】。");
            notice.setContent((language == 1 ? "提现申请反馈" : language == 2 ? "Feedback on withdrawal requests" : "Réponse à la demande de retrait") + ":【" +remark +"】。");
            notice.setUserId(tPubWithdrawal.getUserId());
            notice.setInsertTime(new Date());
            notice.setRead(1);

 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TIntegralOrderController.java

@@ -6,9 +6,7 @@
import com.stylefeng.guns.core.shiro.ShiroKit;
import com.stylefeng.guns.core.util.SinataUtil;
import com.stylefeng.guns.core.util.ToolUtil;
import com.stylefeng.guns.modular.system.model.TEmail;
import com.stylefeng.guns.modular.system.model.TOrderCharter;
import com.stylefeng.guns.modular.system.model.TUser;
import com.stylefeng.guns.modular.system.model.*;
import com.stylefeng.guns.modular.system.service.*;
import com.stylefeng.guns.modular.system.util.EmailUtil;
import org.jsoup.Jsoup;
@@ -23,7 +21,6 @@
import org.springframework.beans.factory.annotation.Autowired;
import com.stylefeng.guns.core.log.LogObjectHolder;
import org.springframework.web.bind.annotation.RequestParam;
import com.stylefeng.guns.modular.system.model.TIntegralOrder;

import javax.annotation.Resource;
import java.io.File;
@@ -57,6 +54,9 @@
    
    @Resource
    private ITSystemNoticeService systemNoticeService;
    
    @Resource
    private ITIntegralGoodsService integralGoodsService;
    
    
    
@@ -124,11 +124,12 @@
        tIntegralOrderService.updateById(tIntegralOrder);
        TIntegralOrder tIntegralOrder1 = tIntegralOrderService.selectById(tIntegralOrder.getId());
        TUser tUser = userService.selectById(tIntegralOrder1.getUserId());
        TIntegralGoods tIntegralGoods = integralGoodsService.selectById(tIntegralOrder.getGoodsId());
        try {
            Integer language = tUser.getLanguage();
            systemNoticeService.addSystemNotice(1, language == 1 ? "您的积分兑换请求已通过审核，平台客服将会联系您，请耐心等待！" :
                    language == 2 ? "Your points redemption request has been approved, and I-GO customer service will contact you. Please be patient!" :
                            "Votre demande d’échange de points a été approuvée et le service client d’I-GO vous contactera. Soyez patient !", tIntegralOrder.getUserId());
            systemNoticeService.addSystemNotice(1, language == 1 ? "您使用" + tIntegralOrder.getIntegral() + "积分成功兑换" + tIntegralGoods.getName() :
                    language == 2 ? "You redeemed " + tIntegralOrder.getIntegral() + " points for the " + tIntegralGoods.getName() + " successfully" :
                            "Vous avez échangé " + tIntegralOrder.getIntegral() + " points avec succès contre le " + tIntegralGoods.getName() + "", tIntegralOrder.getUserId());
        } catch (Exception e) {
            throw new RuntimeException(e);
        }