diff --git a/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java b/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java index 559c3c9..56a478f 100644 --- a/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java +++ b/order/src/main/java/com/order/controller/business/BsOrderCinemaController.java @@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.ResponseBody; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import java.util.Date; import java.util.HashMap; import java.util.Map; @@ -97,6 +98,13 @@ public class BsOrderCinemaController { map.put("orderNo" , bsOrderCinema.getChannelOrderNo()); JSONObject object = CinemaService.getByOrderNo(map); + if (object != null) { + bsOrderCinema.setStatus(object.getInteger("status")); + bsOrderCinema.setUpdateTime(new Date()); + bsOrderCinemaService.update(bsOrderCinema); + } + + return ResponseMsgUtil.success(object); } catch (Exception e) { diff --git a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderCinemaServiceImpl.java b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderCinemaServiceImpl.java index 4e51a07..56b59af 100644 --- a/service/src/main/java/com/hfkj/service/goods/impl/BsOrderCinemaServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/goods/impl/BsOrderCinemaServiceImpl.java @@ -100,10 +100,8 @@ public class BsOrderCinemaServiceImpl implements BsOrderCinemaService { } if (MapUtils.getInteger(map, "status") != null) { criteria.andStatusEqualTo(MapUtils.getInteger(map, "status")); - } else { - criteria.andStatusNotEqualTo(0); } - example.setOrderByClause("create_time desc"); + example.setOrderByClause("exception_status desc"); return bsOrderCinemaMapper.selectByExample(example); } } diff --git a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java index 3b44acc..d65f357 100644 --- a/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java +++ b/service/src/main/java/com/hfkj/service/order/OrderPaySuccessService.java @@ -24,6 +24,7 @@ import com.hfkj.service.goods.impl.GoodsSpecsServiceImpl; import com.hfkj.service.hlt.HuiLianTongUnionCardService; import com.hfkj.sysenum.GoodsVpdSourceEnum; import com.hfkj.sysenum.order.OrderChildProductTypeEnum; +import com.hfkj.sysenum.order.OrderCinemaStatusEnum; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Component; @@ -264,9 +265,12 @@ public class OrderPaySuccessService { orderCinema.setPaySerialNo(order.getPaySerialNo()); orderCinema.setPayTime(order.getPayTime()); orderCinema.setUpdateTime(new Date()); - orderCinema.setStatus(1); + orderCinema.setStatus(OrderCinemaStatusEnum.status5.getCode()); } catch (Exception e) { + if (orderCinema == null) { + orderCinema = new BsOrderCinema(); + } orderCinema.setExceptionStatus(true); orderCinema.setExceptionMsg(e.getMessage()); } finally { diff --git a/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java b/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java index d482024..cb69e69 100644 --- a/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java +++ b/service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java @@ -47,7 +47,8 @@ public class OrderRefundSuccessService { cinema(orderChild); } } catch (Exception e) { - throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , e.getMessage()); + System.out.println("========================================="); + System.out.println(e.getMessage()); } } @@ -60,18 +61,15 @@ public class OrderRefundSuccessService { if (orderCinema != null) { Map map = new HashMap<>(); map.put("orderNo", childOrder.getOrderNo()); - JSONObject object = CinemaService.refundMovieOrder(map); - System.out.println("========================================="); - System.out.println(object); + CinemaService.refundMovieOrder(map); orderCinema.setStatus(-5); orderCinema.setExceptionStatus(false); - bsOrderCinemaService.update(orderCinema); } } catch (Exception e) { orderCinema.setExceptionStatus(true); orderCinema.setExceptionMsg(e.getMessage()); + } finally { bsOrderCinemaService.update(orderCinema); - throw ErrorHelp.genException(SysCode.System , ErrorCode.COMMON_ERROR , e.getMessage()); } } diff --git a/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java b/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java index 8a9edb8..cb93047 100644 --- a/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/order/impl/BsOrderServiceImpl.java @@ -504,6 +504,7 @@ public class BsOrderServiceImpl implements BsOrderService { JSONObject object = CinemaService.getByOrderNo(map); if (object != null && object.getJSONObject("data") != null) { orderModel.setBusiness(object.getJSONObject("data")); + bsOrderCinema.setUpdateTime(new Date()); bsOrderCinema.setStatus(object.getJSONObject("data").getInteger("status")); } diff --git a/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java b/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java index 45b471e..0ed02e8 100644 --- a/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java +++ b/service/src/main/java/com/hfkj/service/pay/huift/TradeService.java @@ -41,7 +41,6 @@ public class TradeService { param.put("shopCode", HuiftConfig.shopcode); param.put("outTradeNo", order.getOrderNo()); param.put("transAmt", order.getPayRealPrice().multiply(new BigDecimal("100")).intValue()); - param.put("mobileNbr", order.getUserPhone()); // 用户标识 param.put("callbackUrl", CommonSysConst.getSysConfig().getDomainName() + "/order/payNotify/huiftPay"); // param.put("remark", ""); // 备注 // param.put("outAppId", ""); diff --git a/service/src/main/java/com/hfkj/service/user/impl/BsUserServiceImpl.java b/service/src/main/java/com/hfkj/service/user/impl/BsUserServiceImpl.java index 42d399d..595a08b 100644 --- a/service/src/main/java/com/hfkj/service/user/impl/BsUserServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/user/impl/BsUserServiceImpl.java @@ -191,6 +191,15 @@ public class BsUserServiceImpl implements BsUserService { UserSessionObject session = new UserSessionObject(); session.setUser(user); + // 查询汇联通工会卡 + List hltCardList = userCardService.getCardList(user.getId(), UserCardTypeEnum.type1); + if (hltCardList.isEmpty()) { + session.setHltCardBind(false); + } else { + session.setHltCardBind(true); + session.setHltCard(hltCardList.get(0)); + } + SessionObject sessionObject = new SessionObject(token(user), session); userCenter.save(sessionObject); // 异步记录登录信息 diff --git a/service/src/main/java/com/hfkj/sysenum/order/OrderCinemaStatusEnum.java b/service/src/main/java/com/hfkj/sysenum/order/OrderCinemaStatusEnum.java index cacb2a9..379bcb7 100644 --- a/service/src/main/java/com/hfkj/sysenum/order/OrderCinemaStatusEnum.java +++ b/service/src/main/java/com/hfkj/sysenum/order/OrderCinemaStatusEnum.java @@ -12,9 +12,9 @@ import lombok.Getter; public enum OrderCinemaStatusEnum { /** - * 待付款 + * 未上送 */ - status0(0, "待付款"), + status0(0, "未上送"), /** * 待出票 @@ -36,6 +36,11 @@ public enum OrderCinemaStatusEnum { */ statusNegative5(-5, "已取消"), + /** + * 代付款 + */ + status20(20, "代付款"), + ; private final int code; diff --git a/user/src/main/java/com/user/controller/BsUserController.java b/user/src/main/java/com/user/controller/BsUserController.java index b5fe69e..24706ec 100644 --- a/user/src/main/java/com/user/controller/BsUserController.java +++ b/user/src/main/java/com/user/controller/BsUserController.java @@ -146,12 +146,8 @@ public class BsUserController { } // 账户密码登录 - if (body.getString("type").equals(UserLoginType.V_FAMILY_OPENID.getCode())) { - - Map other = new HashMap<>(); - return ResponseMsgUtil.success(userService.login(platform, loginType, outsideOpenid, other)); - } - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "登录失败"); + Map other = new HashMap<>(); + return ResponseMsgUtil.success(userService.login(platform, loginType, outsideOpenid, other)); } catch (Exception e) { log.error("LoginController --> phone() error!", e);