|
|
@@ -13,6 +13,9 @@ import java.util.Map;
|
|
|
import java.util.UUID;
|
|
|
import java.util.regex.Matcher;
|
|
|
import java.util.regex.Pattern;
|
|
|
+
|
|
|
+import com.goafanti.common.dao.*;
|
|
|
+import com.goafanti.common.model.*;
|
|
|
import org.apache.commons.beanutils.BeanUtils;
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -23,46 +26,12 @@ import org.springframework.transaction.annotation.Transactional;
|
|
|
import com.goafanti.common.bo.Error;
|
|
|
import com.goafanti.common.constant.AFTConstants;
|
|
|
import com.goafanti.common.constant.ErrorConstants;
|
|
|
-import com.goafanti.common.dao.AdminMapper;
|
|
|
-import com.goafanti.common.dao.BusinessProjectMapper;
|
|
|
-import com.goafanti.common.dao.ContractMapper;
|
|
|
-import com.goafanti.common.dao.ContractTaskLogMapper;
|
|
|
-import com.goafanti.common.dao.ContractTaskMapper;
|
|
|
-import com.goafanti.common.dao.OrganizationManagementMapper;
|
|
|
-import com.goafanti.common.dao.TOrderBillMapper;
|
|
|
-import com.goafanti.common.dao.TOrderChangeMapper;
|
|
|
-import com.goafanti.common.dao.TOrderDetailMapper;
|
|
|
-import com.goafanti.common.dao.TOrderMapper;
|
|
|
-import com.goafanti.common.dao.TmpTableMapper;
|
|
|
-import com.goafanti.common.dao.UserBusinessMapper;
|
|
|
-import com.goafanti.common.dao.UserFollowBusinessMapper;
|
|
|
-import com.goafanti.common.dao.UserFollowMapper;
|
|
|
-import com.goafanti.common.dao.UserLockReleaseMapper;
|
|
|
-import com.goafanti.common.dao.UserMapper;
|
|
|
-import com.goafanti.common.dao.UserRoleMapper;
|
|
|
import com.goafanti.common.enums.DeleteStatus;
|
|
|
import com.goafanti.common.enums.NoticeReadStatus;
|
|
|
import com.goafanti.common.enums.NoticeStatus;
|
|
|
import com.goafanti.common.enums.OrderFlowState;
|
|
|
import com.goafanti.common.enums.UserLockReleaseStatus;
|
|
|
import com.goafanti.common.error.BusinessException;
|
|
|
-import com.goafanti.common.model.Admin;
|
|
|
-import com.goafanti.common.model.Contract;
|
|
|
-import com.goafanti.common.model.ContractTask;
|
|
|
-import com.goafanti.common.model.ContractTaskLog;
|
|
|
-import com.goafanti.common.model.Notice;
|
|
|
-import com.goafanti.common.model.OrganizationManagement;
|
|
|
-import com.goafanti.common.model.TOrder;
|
|
|
-import com.goafanti.common.model.TOrderBill;
|
|
|
-import com.goafanti.common.model.TOrderChange;
|
|
|
-import com.goafanti.common.model.TOrderDetail;
|
|
|
-import com.goafanti.common.model.TmpTable;
|
|
|
-import com.goafanti.common.model.User;
|
|
|
-import com.goafanti.common.model.UserBusiness;
|
|
|
-import com.goafanti.common.model.UserFollow;
|
|
|
-import com.goafanti.common.model.UserFollowBusiness;
|
|
|
-import com.goafanti.common.model.UserLockRelease;
|
|
|
-import com.goafanti.common.model.UserRole;
|
|
|
import com.goafanti.common.utils.AsyncUtils;
|
|
|
import com.goafanti.common.utils.BeanUtilsExt;
|
|
|
import com.goafanti.common.utils.DateUtils;
|
|
|
@@ -115,10 +84,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
@Autowired
|
|
|
private TOrderBillMapper tOrderBillMapper;
|
|
|
@Autowired
|
|
|
- private OrganizationManagementMapper organizationManagementMapper;
|
|
|
+ private DepartmentMapper departmentMapper;
|
|
|
@Autowired
|
|
|
private ContractMapper contractMapper;
|
|
|
- @Autowired
|
|
|
+ @Autowired
|
|
|
private ContractTaskMapper contractTaskMapper;
|
|
|
@Autowired
|
|
|
private TOrderChangeMapper tOrderChangeMapper;
|
|
|
@@ -142,16 +111,16 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
private UserFollowMapper userFollowMapper;
|
|
|
@Autowired
|
|
|
private UserFollowBusinessMapper userFollowBusinessMapper;
|
|
|
-
|
|
|
+
|
|
|
@Value(value = "${mobileRemindCodeTemplate}")
|
|
|
private String mobileRemindCodeTemplate = null;
|
|
|
-
|
|
|
+
|
|
|
@Value(value = "${accessKey}")
|
|
|
private String accessKey = null;
|
|
|
|
|
|
@Value(value = "${accessSecret}")
|
|
|
private String accessSecret = null;
|
|
|
-
|
|
|
+
|
|
|
private final BigDecimal DEFAULT_FIRST_PAYMENT = new BigDecimal(0);//默认首付价格
|
|
|
private final BigDecimal DEFAULT_COMMODITY_PRICE = new BigDecimal(0);//默认单价
|
|
|
private final String DEFAULT_PLATFORM_ID = "0"; //平台默认id
|
|
|
@@ -160,7 +129,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
private final double DEFAULT_COMMODITY_DISCOUNT = 1; //折扣比例
|
|
|
private final String DEFAULT_COMMODITY_MODE = "NO_MODE"; //暂无规格
|
|
|
private final String DEFUALT_SET_UP_COMMENT = "系统自动生产立项信息,请自行修改或补充";
|
|
|
-
|
|
|
+
|
|
|
/*
|
|
|
* -------------------------------------------------- APP管理端 --------------------------------------------------------
|
|
|
*/
|
|
|
@@ -177,9 +146,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
bo.setCommodityPrice("面议");
|
|
|
else
|
|
|
bo.setCommodityPrice(bo.getCommodityPrice()+" 万");
|
|
|
- if(StringUtils.isBlank(bo.getFirstPayment()))
|
|
|
+ if(StringUtils.isBlank(bo.getFirstPayment()))
|
|
|
bo.setFirstPayment("面议");
|
|
|
- else
|
|
|
+ else
|
|
|
bo.setFirstPayment(bo.getFirstPayment()+" 万");
|
|
|
} catch (IllegalAccessException | InvocationTargetException e) {
|
|
|
e.printStackTrace();
|
|
|
@@ -192,17 +161,17 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
* 后期规则:自营服务订单 、需求订单、其他订单不能同时加入购物车
|
|
|
*/
|
|
|
@Override
|
|
|
- public int addIntention(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
|
|
|
+ public int addIntention(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
|
|
|
String createTime,String remarks) throws ParseException {
|
|
|
CommodityDetailBo bo = tOrderMapper.selectCommodityDetail(commodityId,commodityType);
|
|
|
- BigDecimal commodityPrice = StringUtils.isBlank(bo.getCommodityPrice()) ? DEFAULT_COMMODITY_PRICE
|
|
|
+ BigDecimal commodityPrice = StringUtils.isBlank(bo.getCommodityPrice()) ? DEFAULT_COMMODITY_PRICE
|
|
|
: new BigDecimal(Double.valueOf(bo.getCommodityPrice()));
|
|
|
- BigDecimal commodityFirstPayment = StringUtils.isBlank(bo.getCommodityFirstPayment()) ? DEFAULT_FIRST_PAYMENT
|
|
|
+ BigDecimal commodityFirstPayment = StringUtils.isBlank(bo.getCommodityFirstPayment()) ? DEFAULT_FIRST_PAYMENT
|
|
|
: new BigDecimal(Double.valueOf(bo.getCommodityFirstPayment()));
|
|
|
BigDecimal discountPrice = commodityPrice.multiply(new BigDecimal(DEFAULT_COMMODITY_DISCOUNT));
|
|
|
BigDecimal discountFirstPayment = commodityFirstPayment.multiply(new BigDecimal(DEFAULT_COMMODITY_DISCOUNT));
|
|
|
TOrder tOrder = new TOrder();
|
|
|
- tOrder.setOrderNo(orderNo);
|
|
|
+ tOrder.setOrderNo(orderNo);
|
|
|
tOrder.setCreater(DEFAULT_ADMIN_ID);
|
|
|
tOrder.setCreateTime(DateUtils.parseDate(createTime, AFTConstants.YYYYMMDDHHMMSS));
|
|
|
if(commodityType == CommodityType.DEMAND.getTypeCode()){
|
|
|
@@ -228,7 +197,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setOrderRemarks(remarks);
|
|
|
tOrder.setContractType(bo.getCommodityClassify());
|
|
|
setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
|
|
|
-
|
|
|
+
|
|
|
TOrderDetail tOrderDetail = new TOrderDetail();
|
|
|
tOrderDetail.setId(UUID.randomUUID().toString());
|
|
|
tOrderDetail.setOrderNo(orderNo);
|
|
|
@@ -246,7 +215,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrderMapper.insert(tOrder);
|
|
|
return 1;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 订单状态流转
|
|
|
* @param orderAction
|
|
|
@@ -320,15 +289,15 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setActuallyTotalAmount(tOrder.getSignTotalAmount());
|
|
|
tOrder.setLiquidationStatus(LiquidationState.ALREADY_PAY.getCode());
|
|
|
}
|
|
|
- }else if(orderAction == OrderAction.APPLY_FOR_WITHDRAW){ //提现申请
|
|
|
- if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode()
|
|
|
+ }else if(orderAction == OrderAction.APPLY_FOR_WITHDRAW){ //提现申请
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode()
|
|
|
|| tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode()
|
|
|
|| tOrder.getActuallyTotalAmount().doubleValue() <= 0){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"等待提现"));
|
|
|
}
|
|
|
tOrder.setLiquidationStatus(LiquidationState.WAIT_FOR_WITHDRAW.getCode());
|
|
|
}else if(orderAction == OrderAction.CONFIRM_WITHDRAW){ //提现确认 (审核员先审核流水)
|
|
|
- if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode()
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.ALREADY_SIGN.getCode()
|
|
|
|| tOrder.getLiquidationStatus() != LiquidationState.WAIT_FOR_WITHDRAW.getCode()
|
|
|
|| tOrder.getActuallyTotalAmount().doubleValue() <= 0){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"确认提现"));
|
|
|
@@ -348,7 +317,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
if(!flag) throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"取消订单"));
|
|
|
if(TokenManager.getToken() instanceof Admin){
|
|
|
- if(!tOrder.getSellerId().equals(DEFAULT_PLATFORM_ID))
|
|
|
+ if(!tOrder.getSellerId().equals(DEFAULT_PLATFORM_ID))
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"取消订单"));
|
|
|
if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode())
|
|
|
tOrder.setOrderStatus(OrderState.SELLER_REFUSE_BEFORE_SIGNL.getCode());
|
|
|
@@ -366,7 +335,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if( tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode())
|
|
|
tOrder.setOrderStatus(OrderState.BUYER_CANCEL_AFTER_SIGN.getCode());
|
|
|
}
|
|
|
- }
|
|
|
+ }
|
|
|
}else if(orderAction == OrderAction.APPLY_FOR_REFUND){ //退款申请
|
|
|
boolean flag = true;
|
|
|
if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
|
|
|
@@ -375,7 +344,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
|
|
|
+ if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
|
|
|
if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode()
|
|
|
|| tOrder.getLiquidationStatus() == LiquidationState.REFUSE_REFUND.getCode()
|
|
|
|| tOrder.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()
|
|
|
@@ -394,18 +363,18 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
|
|
|
+ if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_FOR_REFUND_CONFIRM.getCode())
|
|
|
flag = false;
|
|
|
if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
|
|
|
flag = false;
|
|
|
if(confrim) {
|
|
|
- if(!flag) throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"同意退款"));
|
|
|
+ if(!flag) throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"同意退款"));
|
|
|
tOrder.setLiquidationStatus(LiquidationState.AGREE_REFUND.getCode());
|
|
|
}else{
|
|
|
if(!flag) throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT,"拒绝退款"));
|
|
|
tOrder.setLiquidationStatus(LiquidationState.REFUSE_REFUND.getCode());
|
|
|
- }
|
|
|
+ }
|
|
|
}else if(orderAction == OrderAction.COMPLETE_REFUND){ //完成退款
|
|
|
boolean flag = true;
|
|
|
if(tOrder.getOrderStatus() != OrderState.BUYER_CANCEL_BEFORE_SIGN.getCode()
|
|
|
@@ -414,7 +383,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
|
|
|
+ if(tOrder.getChangeStatus() == ChangeState.CHANGING.getCode()) flag = true; // Add 2018/4/9 if normal order in changing can refund
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.AGREE_REFUND.getCode())
|
|
|
flag = false;
|
|
|
if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
|
|
|
@@ -431,8 +400,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
/**
|
|
|
* 设置按钮状态
|
|
|
* @param tOrder
|
|
|
@@ -440,7 +409,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
*/
|
|
|
private OperatorActive setOperatorActive(TOrder tOrder){
|
|
|
OperatorActive active = new OperatorActive();
|
|
|
- if(tOrder.getDeleteSign() == ActiveState.ABOLISH.getCode())
|
|
|
+ if(tOrder.getDeleteSign() == ActiveState.ABOLISH.getCode())
|
|
|
return active;
|
|
|
if(tOrder.getDeleteSign() == ActiveState.LOCKING.getCode()) {
|
|
|
active.setApplyUnLock(true);
|
|
|
@@ -460,10 +429,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()) {
|
|
|
/** 需求订单 开始 **/
|
|
|
if (tOrder.getOrderType() == CommodityType.DEMAND.getTypeCode()) {
|
|
|
- active.setConfirmIntention(true);
|
|
|
- active.setRefuseIntention(true);
|
|
|
+ active.setConfirmIntention(true);
|
|
|
+ active.setRefuseIntention(true);
|
|
|
} else {
|
|
|
- active.setConfirmIntention(false);
|
|
|
+ active.setConfirmIntention(false);
|
|
|
active.setRefuseIntention(false);
|
|
|
}
|
|
|
/** 需求订单 结束 **/
|
|
|
@@ -509,7 +478,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
if(tOrder.getActuallyTotalAmount().doubleValue() <= 0)
|
|
|
flag = false;
|
|
|
- active.setApplyForRefund(flag); //申请退款
|
|
|
+ active.setApplyForRefund(flag); //申请退款
|
|
|
}else if(TokenManager.getUserId().equals(tOrder.getSellerId())){ //卖方
|
|
|
active.setPayForFirst(false);
|
|
|
active.setPayForLast(false);
|
|
|
@@ -517,16 +486,16 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if (tOrder.getOrderStatus() == OrderState.WAIT_FOR_CONFIRM.getCode()) {
|
|
|
/** 需求订单 开始 **/
|
|
|
if (tOrder.getOrderType() == CommodityType.DEMAND.getTypeCode()) {
|
|
|
- active.setConfirmIntention(false);
|
|
|
- active.setRefuseIntention(false);
|
|
|
+ active.setConfirmIntention(false);
|
|
|
+ active.setRefuseIntention(false);
|
|
|
} else {
|
|
|
- active.setConfirmIntention(true);
|
|
|
- active.setRefuseIntention(true);
|
|
|
+ active.setConfirmIntention(true);
|
|
|
+ active.setRefuseIntention(true);
|
|
|
}
|
|
|
/** 需求订单 结束 **/
|
|
|
} else {
|
|
|
- active.setConfirmIntention(false);
|
|
|
- active.setRefuseIntention(false);
|
|
|
+ active.setConfirmIntention(false);
|
|
|
+ active.setRefuseIntention(false);
|
|
|
}
|
|
|
boolean flag = true;
|
|
|
if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
|
|
|
@@ -551,7 +520,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
flag = false;
|
|
|
active.setAgreeRefund(flag); //同意退款
|
|
|
active.setRefuseRefund(flag); //拒绝退款
|
|
|
- if (tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode()
|
|
|
+ if (tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode()
|
|
|
&& tOrder.getLiquidationStatus() == LiquidationState.ALREADY_PAY.getCode()
|
|
|
&& tOrder.getActuallyTotalAmount().doubleValue() > 0) {
|
|
|
active.setApplyForWithdraw(true); //申请提现
|
|
|
@@ -586,7 +555,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
boolean flag = true;
|
|
|
if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
- }
|
|
|
+ }
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode()){
|
|
|
@@ -612,7 +581,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
active.setApplyForCancel(false); //申请取消
|
|
|
active.setAgreeRefund(false); //同意退款
|
|
|
active.setRefuseRefund(false); //拒绝退款
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
//平台方作为中间方 确认首付 - 尾款 - 提现 - 退款
|
|
|
if(tOrder.getOrderStatus() == OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
@@ -640,7 +609,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
&& tOrder.getOrderStatus() != OrderState.SELLER_CANCEL_AFTER_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
}
|
|
|
- if(flag && tOrder.getActuallyTotalAmount().doubleValue() == 0
|
|
|
+ if(flag && tOrder.getActuallyTotalAmount().doubleValue() == 0
|
|
|
&& tOrder.getDeleteSign() == DeleteStatus.UNDELETE.getCode()){
|
|
|
active.setApplyRevoke(true); //作废
|
|
|
}else{
|
|
|
@@ -679,7 +648,6 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
* @param transactionSubject 交易科目
|
|
|
* @param payChannel 支付渠道
|
|
|
* @param transactionMode 支付方式
|
|
|
- * @param FundAudit 流水审核
|
|
|
* @return
|
|
|
*/
|
|
|
public int addFundRecord(String orderNo,String creater,String payeeId,String payerId,String remarks,TransactionSubject transactionSubject,PayChannel payChannel,
|
|
|
@@ -701,11 +669,11 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
bill.setCreateTime(new Date());
|
|
|
return tOrderBillMapper.insert(bill);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
public int updatePayForFirst(String orderNo, BigDecimal fundAmount,String remarks) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
- addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks,
|
|
|
+ addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks,
|
|
|
TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
|
|
|
tOrder.setUpdateTime(new Date());
|
|
|
return tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
@@ -714,7 +682,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
@Override
|
|
|
public int updatePayForLast(String orderNo, BigDecimal fundAmount, String remarks) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
- addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks,
|
|
|
+ addFundRecord(orderNo, TokenManager.getUserToken().getNickname(), DEFAULT_PLATFORM_ID, TokenManager.getUserId(), remarks,
|
|
|
TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, fundAmount, TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
|
|
|
tOrder.setUpdateTime(new Date());
|
|
|
return tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
@@ -730,7 +698,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
Pagination<TOrder> data = (Pagination<TOrder>)findPage("selectOrderListByPage", "selectOrderListCount", params, pageNo, pageSize);
|
|
|
List<TOrder> list = (List<TOrder>)data.getList();
|
|
|
C2BOrderDetailBo bo = null;
|
|
|
- List<C2BOrderDetailBo> boList = new ArrayList<C2BOrderDetailBo>();
|
|
|
+ List<C2BOrderDetailBo> boList = new ArrayList<C2BOrderDetailBo>();
|
|
|
List<CommodityDetailBo> commoditys = null;
|
|
|
CommodityDetailBo cdb = null;
|
|
|
if(list.size()>0){
|
|
|
@@ -838,11 +806,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
|
|
|
/**
|
|
|
- *
|
|
|
+ *
|
|
|
* @param transactionSubject 交易科目
|
|
|
* @param transactionAmount 交易金额
|
|
|
- * @param payeeId 收款人
|
|
|
- * @param payerId 付款人
|
|
|
* @return
|
|
|
*/
|
|
|
private String setBusinessDesc(Integer transactionSubject,BigDecimal transactionAmount){
|
|
|
@@ -879,7 +845,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}else if(0 == intention && 0 == formal){
|
|
|
return new Pagination<OrderListBo>();
|
|
|
}
|
|
|
- Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount",
|
|
|
+ Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount",
|
|
|
params, pageNo, pageSize);
|
|
|
TOrder tOrder = null;
|
|
|
List<OrderListBo> list = (List<OrderListBo>)data.getList();
|
|
|
@@ -896,7 +862,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
data.setList(list);
|
|
|
return data;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
private Map<String,Object> disposeParams(OrderListBo bo,String startDate,String endDate){
|
|
|
Map<String,Object> params = new HashMap<>();
|
|
|
if(StringUtils.isNotBlank(bo.getBuyerName())) params.put("buyerName", bo.getBuyerName());
|
|
|
@@ -909,7 +875,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(bo.getLiquidationStatus() != null) params.put("liquidationStatus", bo.getLiquidationStatus());
|
|
|
if(bo.getProjectStage() != null) params.put("projectStage", bo.getProjectStage());
|
|
|
if(bo.getOrderChannel() != null) params.put("orderChannel", bo.getOrderChannel());
|
|
|
-
|
|
|
+
|
|
|
return params;
|
|
|
}
|
|
|
|
|
|
@@ -963,7 +929,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(tOrder.getProjectStage() == ProjectStage.NOT_SATISFY_CONDITION.getCode())
|
|
|
tOrder.setProjectStage(ProjectStage.WAIT_SET_UP.getCode());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
if (flag && !flag2) { //只有待签单或者变更中可修改
|
|
|
throw new BusinessException(new Error(ErrorConstants.ORDER_CAN_NOT_MODIFY, orderNo, ""));
|
|
|
@@ -1030,9 +996,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
return 1;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
public void checkOrder(TOrder tOrder){
|
|
|
- if(tOrder == null)
|
|
|
+ if(tOrder == null)
|
|
|
throw new BusinessException(new Error(ErrorConstants.ORDER_NOT_EXIST, "" ,""));
|
|
|
if(tOrder.getDeleteSign() == ActiveState.ABOLISH.getCode())
|
|
|
throw new BusinessException(new Error(ErrorConstants.ORDER_ALREADY_FREEZE, tOrder.getOrderNo(),""));
|
|
|
@@ -1062,7 +1028,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(bo.getAid().equals(TokenManager.getAdminId())){
|
|
|
isBusinessOwner = true;
|
|
|
releaseList.add(bo);
|
|
|
- }
|
|
|
+ }
|
|
|
}
|
|
|
if(!isBusinessOwner) throw new BusinessException(new Error(ErrorConstants.BUSINESS_ALREADY_LOCKED,businessName,""));
|
|
|
}else{
|
|
|
@@ -1071,14 +1037,14 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
return releaseList;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
private void lockProject(BusinessListBo ub) {
|
|
|
UserLockRelease ulr= new UserLockRelease();
|
|
|
ulr.setId(UUID.randomUUID().toString());
|
|
|
ulr.setType(1);
|
|
|
ulr.setAid(TokenManager.getAdminId());
|
|
|
ulr.setBusinessProjectId(ub.getBusinessProjectId());
|
|
|
- SimpleDateFormat sdf = new SimpleDateFormat( " yyyy-MM-dd HH:mm:ss " );
|
|
|
+ SimpleDateFormat sdf = new SimpleDateFormat( " yyyy-MM-dd HH:mm:ss " );
|
|
|
try {
|
|
|
if (null==ub.getCreateTime()) {
|
|
|
ulr.setLockTime(new Date());
|
|
|
@@ -1092,7 +1058,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
ulr.setUid(ub.getUid());
|
|
|
userLockReleaseMapper.insert(ulr);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@SuppressWarnings("unused")
|
|
|
private void releaseProject(List<LockingReleaseBo> releaseList){
|
|
|
if(releaseList != null && releaseList.size()>0){
|
|
|
@@ -1103,17 +1069,17 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
ulr.setStatus(UserLockReleaseStatus.RELEASE.getCode());
|
|
|
userLockReleaseMapper.updateByPrimaryKeySelective(ulr);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
@Transactional
|
|
|
public int addOrderCommodity(String orderNo, String commodityId,String commodityName, String commodityMode, Integer commodityQuantity,Integer commodityType,
|
|
|
String commodityPrice, String discountPrice,String commodityFirstPayment,String discountFirstPayment, String remarks) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
checkOrder(tOrder);
|
|
|
- if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
+ if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()
|
|
|
&& tOrder.getChangeStatus() != ChangeState.CHANGING.getCode()){
|
|
|
throw new BusinessException(new Error(ErrorConstants.NOT_ACCORD_WITH_NEXT, orderNo,""));
|
|
|
}else{
|
|
|
@@ -1129,7 +1095,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
detail.setDiscountPrice(new BigDecimal(discountPrice));
|
|
|
detail.setCommodityFirstPayment(new BigDecimal(commodityFirstPayment));
|
|
|
detail.setDiscountFirstPayment(new BigDecimal(discountFirstPayment));
|
|
|
- detail.setRemarks(remarks);
|
|
|
+ detail.setRemarks(remarks);
|
|
|
detail.setCreateTime(new Date());
|
|
|
tOrderDetailMapper.insert(detail);
|
|
|
//订单市场价总额
|
|
|
@@ -1223,34 +1189,34 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
return 1;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
- public List<OrganizationManagement> selectMyDeps(){
|
|
|
- if(TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))
|
|
|
- return organizationManagementMapper.selectAllDeps();
|
|
|
+ public List<Department> selectMyDeps(){
|
|
|
+ if(TokenManager.hasRole(AFTConstants.SUPERADMIN) || TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))
|
|
|
+ return departmentMapper.selectAllDeps();
|
|
|
else
|
|
|
return selectCurrentDep(TokenManager.getAdminId());
|
|
|
}
|
|
|
-
|
|
|
- private List<OrganizationManagement> selectSubDeps(List<OrganizationManagement> allData,List<OrganizationManagement> superData){
|
|
|
- List<OrganizationManagement> subData = new ArrayList<>();
|
|
|
+
|
|
|
+ private List<Department> selectSubDeps(List<Department> allData,List<Department> superData){
|
|
|
+ List<Department> subData = new ArrayList<>();
|
|
|
String superIds = "";
|
|
|
- for(OrganizationManagement om : superData){
|
|
|
+ for(Department om : superData){
|
|
|
if(!om.getId().equals(om.getSuperId())){
|
|
|
superIds += om.getId() + ",";
|
|
|
}
|
|
|
}
|
|
|
- if(StringUtils.isNotBlank(superIds)) subData = organizationManagementMapper.selectSubDeps(superIds.substring(0, superIds.length()-1));
|
|
|
+ if(StringUtils.isNotBlank(superIds)) subData = departmentMapper.selectSubDeps(superIds.substring(0, superIds.length()-1));
|
|
|
if(subData != null && subData.size()>0) {
|
|
|
allData.addAll(subData);
|
|
|
selectSubDeps(allData,subData);
|
|
|
- }
|
|
|
+ }
|
|
|
return allData;
|
|
|
- }
|
|
|
-
|
|
|
- private List<OrganizationManagement> selectCurrentDep(String managerId){
|
|
|
- List<OrganizationManagement> allData = new ArrayList<OrganizationManagement>();
|
|
|
- List<OrganizationManagement> superData = organizationManagementMapper.selectCurrentDeps(managerId);
|
|
|
+ }
|
|
|
+
|
|
|
+ private List<Department> selectCurrentDep(String managerId){
|
|
|
+ List<Department> allData = new ArrayList<Department>();
|
|
|
+ List<Department> superData = departmentMapper.selectCurrentDeps(managerId);
|
|
|
if(superData != null && superData.size()>0){
|
|
|
allData.addAll(superData);
|
|
|
}
|
|
|
@@ -1269,7 +1235,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}else{
|
|
|
if(!depIds.contains(",")) params.put("depIds","'" + depIds + "'");
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}else{
|
|
|
if(!TokenManager.hasRole(AFTConstants.SUPERADMIN) && !TokenManager.hasRole(AFTConstants.APPROVAL_DECISION))
|
|
|
return new Pagination<OrderListBo>();
|
|
|
@@ -1280,7 +1246,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}else if(0 == intention && 0 == formal){
|
|
|
return new Pagination<OrderListBo>();
|
|
|
}
|
|
|
- Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount",
|
|
|
+ Pagination<OrderListBo> data = (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount",
|
|
|
params, pageNo, pageSize);
|
|
|
TOrder tOrder = null;
|
|
|
List<OrderListBo> list = (List<OrderListBo>)data.getList();
|
|
|
@@ -1319,7 +1285,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
|
|
|
if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
|
|
|
params.put("deleteStatus", 1);
|
|
|
- return (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount",
|
|
|
+ return (Pagination<OrderListBo>)findPage("selectServiceOrderByPage","selectServiceOrderCount",
|
|
|
params, pageNo, pageSize);
|
|
|
}
|
|
|
|
|
|
@@ -1335,7 +1301,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(bo.getOrderStatus() != null) params.put("orderStatus", bo.getOrderStatus());
|
|
|
if(StringUtils.isNotBlank(startDate)) params.put("startDate", startDate);
|
|
|
if(StringUtils.isNotBlank(endDate)) params.put("endDate", endDate);
|
|
|
- return (Pagination<OrderListBo>)findPage("selectPublicOrderByPage","selectPublicOrderCount",
|
|
|
+ return (Pagination<OrderListBo>)findPage("selectPublicOrderByPage","selectPublicOrderCount",
|
|
|
params, pageNo, pageSize);
|
|
|
}
|
|
|
|
|
|
@@ -1350,7 +1316,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
- public Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,
|
|
|
+ public Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,
|
|
|
String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,Integer isDistributionFinance,
|
|
|
String startDate,String endDate,Integer pageNo, Integer pageSize) {
|
|
|
Map<String, Object> params = new HashMap<String, Object>();
|
|
|
@@ -1389,8 +1355,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
/** 特殊处理字段结束 **/
|
|
|
return (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<BillListBo> queryMyBillList(String payeeName, String payerName, String depId,
|
|
|
@@ -1411,7 +1377,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
/** 特殊处理字段结束 **/
|
|
|
return (Pagination<BillListBo>)findPage("selectBillByPage","selectBillCount", params, pageNo, pageSize);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
public Pagination<BillListBo> queryAllBillList(String payeeName, String payerName, String depId,
|
|
|
@@ -1463,7 +1429,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
checkOrder(order);
|
|
|
if(order.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
&& bill.getTransactionSubject() == TransactionSubject.SUPPLY_PAY.getCode()) { //代付+首付状态
|
|
|
- setOrderState(OrderAction.CONFIRM_PAY_FOR_FIRST, bill.getTransactionAmount(), order, false);
|
|
|
+ setOrderState(OrderAction.CONFIRM_PAY_FOR_FIRST, bill.getTransactionAmount(), order, false);
|
|
|
tOrderMapper.updateByPrimaryKeySelective(order);
|
|
|
//如果支付后订单符合待立项,系统自动立项 2018-4-10
|
|
|
if(order.getProjectStage() == ProjectStage.WAIT_SET_UP.getCode())
|
|
|
@@ -1481,7 +1447,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrderMapper.updateByPrimaryKeySelective(order);
|
|
|
}else if(order.getLiquidationStatus() == LiquidationState.WAIT_FOR_WITHDRAW.getCode()
|
|
|
&& bill.getTransactionSubject() == TransactionSubject.SUPPLY_COLLECT.getCode()) { //代收+提现状态
|
|
|
- setOrderState(OrderAction.CONFIRM_WITHDRAW, bill.getTransactionAmount(), order, false);
|
|
|
+ setOrderState(OrderAction.CONFIRM_WITHDRAW, bill.getTransactionAmount(), order, false);
|
|
|
tOrderMapper.updateByPrimaryKeySelective(order);
|
|
|
} else {
|
|
|
throw new BusinessException(new Error(ErrorConstants.BILL_ALREADY_EXPIRE, billNo , ""));
|
|
|
@@ -1561,7 +1527,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
|
|
|
String userName=tOrderMapper.selectByUserName(tOrder.getOrderNo());
|
|
|
//String message=noticeType.getDesc() + ": 订单编号-" + tOrder.getOrderNo() + ",变更内容:"+noticeComment+",操作人-" + TokenManager.getAdminToken().getName();
|
|
|
- String paramString = "{\"number\":\"" + tOrder.getOrderNo()
|
|
|
+ String paramString = "{\"number\":\"" + tOrder.getOrderNo()
|
|
|
+ "\",\"operator\":\"" + TokenManager.getAdminToken().getName()
|
|
|
+ "\",\"name\":\"" + userName
|
|
|
+ "\",\"time\":\"" + sdf.format(new Date())
|
|
|
@@ -1569,7 +1535,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
"\"}";
|
|
|
MobileMessageUtils.sendMessage(mobileRemindCodeTemplate, paramString, mobile, accessKey, accessSecret);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
|
|
|
@SuppressWarnings("unchecked")
|
|
|
@Override
|
|
|
@@ -1586,7 +1552,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
params.put("depId", depId);
|
|
|
if(approval != null)
|
|
|
params.put("approval", approval);
|
|
|
- return (Pagination<OrderListBo>)findPage("selectSetUpServiceOrderByPage","selectSetUpServiceOrderCount",
|
|
|
+ return (Pagination<OrderListBo>)findPage("selectSetUpServiceOrderByPage","selectSetUpServiceOrderCount",
|
|
|
params, pageNo, pageSize);
|
|
|
}
|
|
|
|
|
|
@@ -1600,12 +1566,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
if(tOrder.getOrderStatus() == OrderState.ALREADY_SIGN.getCode()){
|
|
|
if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode())
|
|
|
flag = true;
|
|
|
- if(tOrder.getLiquidationStatus() == LiquidationState.ALREADY_PAY.getCode())
|
|
|
+ if(tOrder.getLiquidationStatus() == LiquidationState.ALREADY_PAY.getCode())
|
|
|
flag = true;
|
|
|
if(tOrder.getApproval() == ApprovalState.AUDIT_PASS.getCode())
|
|
|
flag = true;
|
|
|
- }
|
|
|
- if(!flag)
|
|
|
+ }
|
|
|
+ if(!flag)
|
|
|
throw new BusinessException(new Error(ErrorConstants.ORDER_CAN_NOT_MODIFY, orderNo, ""));
|
|
|
tOrder.setProjectStage(ProjectStage.ALREADY_SET_UP.getCode());
|
|
|
tOrder.setOrderStage(OrderStage.PROJECT.getCode());
|
|
|
@@ -1673,7 +1639,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
if(tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
|| tOrder.getLiquidationStatus() == LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()){
|
|
|
- addFundRecord(orderNo, "测试用户", DEFAULT_PLATFORM_ID, TokenManager.getUserId(), "",
|
|
|
+ addFundRecord(orderNo, "测试用户", DEFAULT_PLATFORM_ID, TokenManager.getUserId(), "",
|
|
|
TransactionSubject.SUPPLY_PAY,PayChannel.UNIONPAY, new BigDecimal(payAmount), TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
|
|
|
tOrder.setUpdateTime(new Date());
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
@@ -1687,7 +1653,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
public int updateRefundForTest(String orderNo, String refundAmount) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
if(tOrder.getLiquidationStatus() == LiquidationState.AGREE_REFUND.getCode()){
|
|
|
- addFundRecord(orderNo, "测试用户", DEFAULT_PLATFORM_ID, TokenManager.getUserId(), "",
|
|
|
+ addFundRecord(orderNo, "测试用户", DEFAULT_PLATFORM_ID, TokenManager.getUserId(), "",
|
|
|
TransactionSubject.REFUND,PayChannel.UNIONPAY, new BigDecimal(refundAmount).multiply(new BigDecimal(-1)), TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
|
|
|
tOrder.setUpdateTime(new Date());
|
|
|
tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
@@ -1696,7 +1662,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
return 1;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
@Override
|
|
|
public int updateDistributionOrder(String orderNo, String financeId) {
|
|
|
TOrder tOrder = tOrderMapper.selectByPrimaryKey(orderNo);
|
|
|
@@ -1736,7 +1702,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
boolean flag = true;
|
|
|
if(tOrder.getOrderStatus() != OrderState.WAIT_FOR_SIGN.getCode()){
|
|
|
flag = false;
|
|
|
- }
|
|
|
+ }
|
|
|
if(tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_FIRST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.WAIT_PAY_LAST_BALANCE.getCode()
|
|
|
&& tOrder.getLiquidationStatus() != LiquidationState.ALREADY_PAY.getCode()){
|
|
|
@@ -1750,8 +1716,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
return 1;
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
private String getSalesmanIdByUid(String uid){
|
|
|
User u = userMapper.selectByPrimaryKey(uid);
|
|
|
if(u!=null&&StringUtils.isBlank(u.getAid())){
|
|
|
@@ -1780,7 +1746,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
setOrderState(OrderAction.CONFIRM_REFUND, new BigDecimal(0), tOrder, confirm);
|
|
|
tOrder.setUpdateTime(new Date());
|
|
|
if(confirm){ //同意退款生成退款流水
|
|
|
- BigDecimal transactionAmount = tOrder.getActuallyTotalAmount().subtract(tOrder.getActuallyBrokerageAmount()).multiply(new BigDecimal(-1));
|
|
|
+ BigDecimal transactionAmount = tOrder.getActuallyTotalAmount().subtract(tOrder.getActuallyBrokerageAmount()).multiply(new BigDecimal(-1));
|
|
|
addFundRecord(orderNo, "平台方", DEFAULT_PLATFORM_ID,TokenManager.getUserId(), "同意退款系统生成流水",
|
|
|
TransactionSubject.REFUND, PayChannel.UNIONPAY,transactionAmount,TransactionMode.OFFLINE, AuditState.WAIT_AUDIT);
|
|
|
}
|
|
|
@@ -1797,25 +1763,25 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setUpdateTime(new Date());
|
|
|
return tOrderMapper.updateByPrimaryKeySelective(tOrder);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* PC端添加意向
|
|
|
* 只能购买一份
|
|
|
* 后期规则:自营服务订单 、需求订单、其他订单不能同时加入购物车
|
|
|
- * @throws ParseException
|
|
|
+ * @throws ParseException
|
|
|
*/
|
|
|
@Override
|
|
|
- public int addPurpose(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
|
|
|
+ public int addPurpose(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
|
|
|
String createTime,String remarks) throws ParseException {
|
|
|
CommodityDetailBo bo = tOrderMapper.selectCommodityDetail(commodityId,commodityType);
|
|
|
- BigDecimal commodityPrice = StringUtils.isBlank(bo.getCommodityPrice()) ? DEFAULT_COMMODITY_PRICE
|
|
|
+ BigDecimal commodityPrice = StringUtils.isBlank(bo.getCommodityPrice()) ? DEFAULT_COMMODITY_PRICE
|
|
|
: new BigDecimal(Double.valueOf(bo.getCommodityPrice()));
|
|
|
- BigDecimal commodityFirstPayment = StringUtils.isBlank(bo.getCommodityFirstPayment()) ? DEFAULT_FIRST_PAYMENT
|
|
|
+ BigDecimal commodityFirstPayment = StringUtils.isBlank(bo.getCommodityFirstPayment()) ? DEFAULT_FIRST_PAYMENT
|
|
|
: new BigDecimal(Double.valueOf(bo.getCommodityFirstPayment()));
|
|
|
BigDecimal discountPrice = commodityPrice.multiply(new BigDecimal(DEFAULT_COMMODITY_DISCOUNT));
|
|
|
BigDecimal discountFirstPayment = commodityFirstPayment.multiply(new BigDecimal(DEFAULT_COMMODITY_DISCOUNT));
|
|
|
TOrder tOrder = new TOrder();
|
|
|
- tOrder.setOrderNo(orderNo);
|
|
|
+ tOrder.setOrderNo(orderNo);
|
|
|
tOrder.setCreater(DEFAULT_ADMIN_ID);
|
|
|
tOrder.setCreateTime(DateUtils.parseDate(createTime, AFTConstants.YYYYMMDDHHMMSS));
|
|
|
if(commodityType == CommodityType.DEMAND.getTypeCode()){
|
|
|
@@ -1837,12 +1803,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrder.setOrderChannel(OrderChannel.PORTAL.getCode());
|
|
|
tOrder.setApproval(ApprovalState.NORMAL.getCode());
|
|
|
tOrder.setChangeStatus(ChangeState.UNCHANGE.getCode());
|
|
|
- tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));
|
|
|
-
|
|
|
+ tOrder.setSalesmanId(getSalesmanIdByUid(TokenManager.getAdminId()));
|
|
|
+
|
|
|
tOrder.setOrderRemarks(remarks);
|
|
|
tOrder.setContractType(bo.getCommodityClassify());
|
|
|
setOrderState(OrderAction.ADD_INTENTION, new BigDecimal(0), tOrder, false);
|
|
|
-
|
|
|
+
|
|
|
TOrderDetail tOrderDetail = new TOrderDetail();
|
|
|
tOrderDetail.setId(UUID.randomUUID().toString());
|
|
|
tOrderDetail.setOrderNo(orderNo);
|
|
|
@@ -1893,10 +1859,9 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
tOrderChangeMapper.updateByPrimaryKeySelective(change);
|
|
|
return updateOrderSatusByChange(change.getOrderNo());
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
/**
|
|
|
* 更新变更状态
|
|
|
- * @param changeId
|
|
|
* @return
|
|
|
*/
|
|
|
private int updateOrderSatusByChange(String orderNo){
|
|
|
@@ -1930,7 +1895,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
List<TmpTable> tmpData = tmpTableMapper.selectAll();
|
|
|
int taskDistribution = TaskDistributionState.NOT_DISTRIBUTION.getCode();
|
|
|
for(TmpTable tt: tmpData){
|
|
|
- if(tt.getAllCount() == tt.getDisCount())
|
|
|
+ if(tt.getAllCount() == tt.getDisCount())
|
|
|
taskDistribution = TaskDistributionState.ALL_DISTRIBUTION.getCode();
|
|
|
else if(tt.getAllCount() > tt.getDisCount() && tt.getDisCount() != 0)
|
|
|
taskDistribution = TaskDistributionState.PART_DISTRIBUTION.getCode();
|
|
|
@@ -1940,7 +1905,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
}
|
|
|
return 1;
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
private void generatorNoticeData(NoticeStatus noticeType,String noticeComment,TOrder tOrder){
|
|
|
if(tOrder == null) return;
|
|
|
Notice notice = null;
|
|
|
@@ -1997,8 +1962,8 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
|
|
|
|
|
|
private void MobileNotice(List<String> targetIds, TOrder tOrder) {
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -2023,10 +1988,10 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
c.setCreateTime(new Date());
|
|
|
contractTaskLogMapper.insert(c);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
@@ -2086,7 +2051,7 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
userBusiness.setUid(fbb.getUid());
|
|
|
userBusiness.setAid(TokenManager.getAdminId());
|
|
|
userBusiness.setRemarks(ub.getRemarks());
|
|
|
- userBusinessMapper.insert(userBusiness);
|
|
|
+ userBusinessMapper.insert(userBusiness);
|
|
|
//更新业务中间表
|
|
|
userFollowBusiness.setBusinessId(ubId);
|
|
|
userFollowBusiness.setCustomerStatus(ub.getCustomerStatus());
|
|
|
@@ -2097,12 +2062,12 @@ public class OrderServiceImpl extends BaseMybatisDao<TOrderMapper> implements Or
|
|
|
userFollowBusiness.setBusinessProjectId(ub.getBusinessProjectId());
|
|
|
userFollowBusinessMapper.insert(userFollowBusiness);
|
|
|
}
|
|
|
-
|
|
|
+
|
|
|
}
|
|
|
-
|
|
|
-
|
|
|
+
|
|
|
+
|
|
|
return 1;
|
|
|
}
|
|
|
|
|
|
-
|
|
|
+
|
|
|
}
|