|
@@ -3,7 +3,9 @@ package com.caimei.modules.order.service;
|
|
import com.caimei.modules.hehe.dao.HeHeNewOrderDao;
|
|
import com.caimei.modules.hehe.dao.HeHeNewOrderDao;
|
|
import com.caimei.modules.order.dao.*;
|
|
import com.caimei.modules.order.dao.*;
|
|
import com.caimei.modules.order.entity.*;
|
|
import com.caimei.modules.order.entity.*;
|
|
|
|
+import com.caimei.modules.user.dao.CmUserBalanceRecordDao;
|
|
import com.caimei.modules.user.dao.NewCmShopDao;
|
|
import com.caimei.modules.user.dao.NewCmShopDao;
|
|
|
|
+import com.caimei.modules.user.entity.CmUserBalanceRecord;
|
|
import com.caimei.modules.user.entity.NewCmShop;
|
|
import com.caimei.modules.user.entity.NewCmShop;
|
|
import com.caimei.utils.MathUtil;
|
|
import com.caimei.utils.MathUtil;
|
|
import com.thinkgem.jeesite.common.persistence.Page;
|
|
import com.thinkgem.jeesite.common.persistence.Page;
|
|
@@ -49,6 +51,8 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
|
|
private HeHeNewOrderDao heHeNewOrderDao;
|
|
private HeHeNewOrderDao heHeNewOrderDao;
|
|
@Resource
|
|
@Resource
|
|
private CmRefundShopRecordDao cmRefundShopRecordDao;
|
|
private CmRefundShopRecordDao cmRefundShopRecordDao;
|
|
|
|
+ @Resource
|
|
|
|
+ private CmUserBalanceRecordDao cmUserBalanceRecordDao;
|
|
|
|
|
|
public CmDiscernReceipt get(String id) {
|
|
public CmDiscernReceipt get(String id) {
|
|
return super.get(id);
|
|
return super.get(id);
|
|
@@ -199,6 +203,22 @@ public class CmDiscernReceiptService extends CrudService<CmDiscernReceiptDao, Cm
|
|
}
|
|
}
|
|
}
|
|
}
|
|
newOrderDao.update(order);
|
|
newOrderDao.update(order);
|
|
|
|
+ // 充值定金商品
|
|
|
|
+ Integer depositProductId = newOrderDao.getDepositOrderProductId(order.getOrderID());
|
|
|
|
+ if (6060 == depositProductId) {
|
|
|
|
+ // 定金商品撤销收款,用户余额扣除
|
|
|
|
+ newOrderDao.updateUserMoneyByUserId(order.getPayTotalFee(), order.getUserID());
|
|
|
|
+ // 添加余额收支记录
|
|
|
|
+ CmUserBalanceRecord cmUserBalanceRecord = new CmUserBalanceRecord();
|
|
|
|
+ cmUserBalanceRecord.setType("2");
|
|
|
|
+ cmUserBalanceRecord.setBalanceType("8");
|
|
|
|
+ cmUserBalanceRecord.setAddDate(new Date());
|
|
|
|
+ cmUserBalanceRecord.setDelFlag("0");
|
|
|
|
+ cmUserBalanceRecord.setAmount(order.getPayTotalFee().toString());
|
|
|
|
+ cmUserBalanceRecord.setOrderId( order.getUserID());
|
|
|
|
+ cmUserBalanceRecord.setRemark("定金商品撤销收款");
|
|
|
|
+ cmUserBalanceRecordDao.insertUserBalanceRecord(cmUserBalanceRecord);
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|