|
|
@@ -171,13 +171,16 @@ public class OrderServiceImpl implements OrderService {
|
|
|
WxJsonModel model = WxJsonModel.newInstance();
|
|
|
CmOperationUser operationUser = loginMapper.doLogin(openid, organizeID);
|
|
|
if (operationUser != null && operationUser.getUserID() == userID) {
|
|
|
- return model.success();
|
|
|
+ return model.success(true);
|
|
|
}
|
|
|
CmMallShareCodeRecord shareCodeRecord = orderMapper.findShareCodeRecord(openid, orderID);
|
|
|
if (shareCodeRecord != null && shareCodeRecord.getExpiredTime().compareTo(new Date()) == 1) {
|
|
|
return model.success();
|
|
|
}
|
|
|
OrderShareCode orderShareCode = orderMapper.queryCode(orderID);
|
|
|
+ if (orderShareCode == null) return model.error("该订单没有生成分享码");
|
|
|
+ CmOrder order = orderMapper.findOrder(orderID);
|
|
|
+ if (order == null) return model.error("该订单已删除");
|
|
|
if (orderShareCode.getShareCode().equals(shareCode)) {
|
|
|
CmMallShareCodeRecord codeRecord = new CmMallShareCodeRecord();
|
|
|
codeRecord.setOpenid(openid);
|
|
|
@@ -423,7 +426,7 @@ public class OrderServiceImpl implements OrderService {
|
|
|
|
|
|
/**判断前端传入orderShouldPayFee订单应付金额,和后台计算应付金额对比*/
|
|
|
double v = payableAmount.subtract(new BigDecimal(orderShouldPayFee)).doubleValue();
|
|
|
- logger.info(">>>>>payableAmount:"+payableAmount+"orderShouldPayFee:"+orderShouldPayFee);
|
|
|
+ logger.info(">>>>>payableAmount:" + payableAmount + "orderShouldPayFee:" + orderShouldPayFee);
|
|
|
if (v < -0.1d || v > 0.1d) {//考虑前端计算不精确
|
|
|
return wxJsonModel.error("-1", "订单付款金额异常");
|
|
|
}
|
PLF