Skip to content

C
cloud-platform
Commit 7b55f95c authored by hanfeng's avatar hanfeng
Browse files
Options

Merge remote-tracking branch 'origin/dev' into dev

parents 851b34f7 f7b927ab
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 22 deletions
ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/GlobalExceptionHandler.java
View file @ 7b55f95c
......@@ -19,6 +19,8 @@ import org.springframework.web.context.request.WebRequest;
import org.springframework.web.servlet.mvc.method.annotation.ResponseEntityExceptionHandler;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
import java.io.StringWriter;
import static org.springframework.http.HttpStatus.NOT_EXTENDED;
......@@ -75,6 +77,14 @@ public class GlobalExceptionHandler extends ResponseEntityExceptionHandler {
public BaseResponse otherExceptionHandler(HttpServletResponse response, Exception ex) {
response.setStatus(500);
logger.error(ex.getMessage(),ex);
Throwable cause = ex.getCause();
if(cause != null && cause.toString().contains("Exception")) {
StringWriter stringWriter = new StringWriter();
cause.printStackTrace(new PrintWriter(stringWriter));
logger.error(cause.getMessage(), ex);
HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + stringWriter.toString());
return new BaseResponse(5000, "Server exception: " + ex.getMessage());
}
HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + ex);
return new BaseResponse(CommonConstants.EX_OTHER_CODE, ex.getMessage());
}
......
ace-common/src/main/java/com/github/wxiaoqi/security/common/handler/PlatformExceptionHandler.java
View file @ 7b55f95c
......@@ -10,6 +10,9 @@ import org.apache.commons.lang3.StringUtils;
import org.springframework.web.bind.annotation.ExceptionHandler;
import org.springframework.web.bind.annotation.RestControllerAdvice;
import java.io.PrintWriter;
import java.io.StringWriter;
@RestControllerAdvice("com.xxfc.platform")
@Slf4j
public class PlatformExceptionHandler {
......@@ -26,10 +29,13 @@ public class PlatformExceptionHandler {
//服务器异常
@ExceptionHandler(Exception.class)
public ObjectRestResponse<?> exceptionHandler(Exception e){
Throwable cause = e.getCause();
if(cause != null && cause.toString().contains("Exception")) {
StringWriter stringWriter = new StringWriter();
cause.printStackTrace(new PrintWriter(stringWriter));
log.error(cause.getMessage(), e);
HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + e);
HttpRequestUtil.httpGet("http://10.5.52.3:8765/api/universal/mail/app/unauth/send?toUser=jiaoruizhen@126.com&subject=服务器异常&content=" + stringWriter.toString());
return assembleResult(ObjectRestResponse.createFailedResult(5000, "服务器开小差了，请稍后重试！"), "Server exception: " + e.getMessage());
}
log.error("Server exception: ", e);
......
ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
View file @ 7b55f95c
......@@ -140,6 +140,15 @@ public interface UserFeign {
@GetMapping("/public/getUsersByUserIds")
ObjectRestResponse<List<AppUserVo>> getUsersByUserIds(@RequestParam("ids") List<Integer> ids);
@GetMapping(value = "/app/user/users")
List<Integer> findAppUserIds(@RequestParam(value = "phone",required = false) String phone,
@RequestParam(value = "leaderPhone",required = false) String leaderPhone,
@RequestParam(value = "name",required = false) String name);
@PostMapping(value = "/app/user/users/info")
List<UserBo> findUserDetailByUserBo(@RequestBody(required = false) List<UserBo> userBos);
@GetMapping("/member/user")
BaseUserMember findBaseUserMemberByUserId(@RequestParam(value = "userId") Integer userId);
......@@ -149,14 +158,4 @@ public interface UserFeign {
@RequestParam(value = "cono",required = false) String cono,
@RequestParam(value = "reason",required = false) String reason,
@RequestParam(value = "isSuccess") Boolean isSuccess);
@GetMapping(value = "/app/user/users")
List<Integer> findAppUserIds(@RequestParam(value = "phone",required = false) String phone,
@RequestParam(value = "leaderPhone",required = false) String leaderPhone,
@RequestParam(value = "name",required = false) String name);
@PostMapping(value = "/app/user/users/info")
List<UserBo> findUserDetailByUserBo(@RequestBody(required = false) List<UserBo> userBos);
}
xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/UserCouponDTO.java
View file @ 7b55f95c
......@@ -25,6 +25,9 @@ public class UserCouponDTO {
@ApiModelProperty(value = "抵扣金额")
private BigDecimal usedAmount;
@ApiModelProperty(value = "时效")
private Integer validType;
@ApiModelProperty(value = "0-未使用；1-已使用")
private Integer isUse;
......
xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/UserCouponPageVo.java
View file @ 7b55f95c
......@@ -25,7 +25,9 @@ public class UserCouponPageVo {
@ApiModelProperty(value = "抵扣金额")
private BigDecimal usedAmount;
@ApiModelProperty(value = "时效")
private Integer validType;
@ApiModelProperty(value = "0-未使用；1-已使用")
private Integer isUse;
......
xx-activity/xx-activity-server/src/main/resources/mapper/UserCouponMapper.xml
View file @ 7b55f95c
......@@ -82,6 +82,7 @@
uc.is_use AS `isUse`,
cp.title,
cp.used_amount AS `usedAmount`,
cp.valid_type AS `validType`,
uc.crt_time AS `crtTime`,
uc.expire_time AS `expireTime`,
uc.use_time AS `useTime`
......@@ -94,7 +95,7 @@
<if test="status != null">
AND `is_use`=#{status}
</if>) AS `uc`
INNER JOIN ( SELECT `id`, `title`, `used_amount` FROM `coupon` WHERE 1=1
INNER JOIN ( SELECT `id`, `title`, `used_amount`,`valid_type` FROM `coupon` WHERE 1=1
<if test="couponId != null">
AND `id`=#{couponId}
</if>
......
xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.java
View file @ 7b55f95c
......@@ -370,8 +370,16 @@ public class MsgBiz {
}
}
//下单时间
if (msgQueryDto.getStartTime() != null) {
query.addCriteria(Criteria.where("body.time").gte(msgQueryDto.getStartTime())).addCriteria((Criteria.where("body.time").lte(msgQueryDto.getEndTime())));
if (msgQueryDto.getStartTime() != null ) {
if (msgQueryDto.getEndTime() == null) {
query.addCriteria(Criteria.where("body.time").gte(msgQueryDto.getStartTime()).lte(System.currentTimeMillis()));
} else {
query.addCriteria(Criteria.where("body.time").gte(msgQueryDto.getStartTime()).lte(msgQueryDto.getEndTime()));
}
} else {
if (msgQueryDto.getEndTime() != null) {
query.addCriteria(Criteria.where("body.time").gte(57600000).lte(msgQueryDto.getEndTime()));
}
}
//用户名
if (StringUtils.isNotBlank(msgQueryDto.getUsername())) {
......
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java
View file @ 7b55f95c
......@@ -6,6 +6,7 @@ import com.xxfc.platform.order.entity.OrderVehicleCrosstown;
import com.xxfc.platform.order.pojo.DedDetailDTO;
import lombok.Data;
import java.util.Date;
import java.math.BigDecimal;
import java.util.Date;
import java.util.List;
......
xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/VehicleItemDTO.java
View file @ 7b55f95c
......@@ -113,8 +113,11 @@ public class VehicleItemDTO extends OrderItem {
}
BigDecimal usedAmount = BigDecimal.ZERO;
for(VMCalendarPriceCostDTO vmcpcd : vmcpds) {
usedAmount.add(vmcpcd.getPrice());
// for(VMCalendarPriceCostDTO vmcpcd : vmcpds) {
// usedAmount.add(vmcpcd.getPrice());
// }
for(int i = 0; i < useDays; i++) {
usedAmount = usedAmount.add(vmcpds.get(i).getPrice());
}
return usedAmount;
}
......@@ -133,11 +136,11 @@ public class VehicleItemDTO extends OrderItem {
BigDecimal freeAmount = BigDecimal.ZERO;
if(null != offsetDay) {
for(int i = 0; i < offsetDay; i++) {
freeAmount.add(vmcpds.get(i).getFreeAmount());
freeAmount = freeAmount.add(vmcpds.get(i).getFreeAmount());
}
}else {
for(VMCalendarPriceCostDTO vmcpcd : vmcpds) {
freeAmount.add(vmcpcd.getFreeAmount());
freeAmount = freeAmount.add(vmcpcd.getFreeAmount());
}
}
return freeAmount;
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
View file @ 7b55f95c
......@@ -131,7 +131,7 @@ public class OrderVehicleCrosstownBiz extends BaseBiz<OrderVehicaleCrosstownMapp
if (value.getType()!=1){
Example example = new Example(OrderAccount.class);
//获取退还部分押金和剩余押金的记录
example.createCriteria().andEqualTo("orderId",value.getOrderId()).andIn("accountType",Lists.newArrayList(AccountTypeEnum.OUT_PART_DEPOSIT.getCode(),AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode()) );
example.createCriteria().andEqualTo("orderId",value.getOrderId()).andIn("accountType",Lists.newArrayList(AccountTypeEnum.OUT_PART_DEPOSIT.getCode(),AccountTypeEnum.OUT_RESIDUE_DEPOSIT.getCode()));
List<OrderAccount> orderAccounts = orderAccountBiz.selectByExample(example);
if (CollectionUtil.isEmpty(orderAccounts)) {
value.setActualDeposit("定损中");
......
xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
View file @ 7b55f95c
......@@ -149,7 +149,7 @@ public class OrderCancelBiz {
if(timeLag < 0 ) {
Integer useDays = orderCalculateBiz.getIncludeDays(orvd.getStartTime(), System.currentTimeMillis());
if(useDays > orvd.getDayNum()) {
useDays = orvd.getUsedDay();
useDays = orvd.getDayNum();
}
inProgressVO = orderCalculateBiz.calculateOrderComplete(baseOrder, orvd, oad, vehicleItemDTO, useDays, Boolean.TRUE);
......
xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java
View file @ 7b55f95c
......@@ -558,7 +558,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay>{
model.setTotalAmount(realAmount.toString()); // 结算支付金额
model.setSellerId(SystemConfig.ALIPAY_PID); // 填写卖家支付宝账户pid
model.setBuyerId(SystemConfig.ALIPAY_APPID); // 填写预授权用户uid，通过预授权冻结接口返回的payer_user_id字段获取
if (StringUtils.isNotBlank(subject)) {
if (StringUtils.isNotBlank(refundReason)) {
model.setBody(refundReason); // 可填写备注信息
} else {
model.setBody("订单费用");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment