Merge branch 'dev' of http://gitea.dctpay.com/hurui/puhui-go into dev

order/src/main/java/com/order/controller/OrderRefundController.java

@@ -50,6 +50,7 @@ public class OrderRefundController {
     private BsOrderRefundService orderRefundService;
     @Resource
     private BsOrderChildService orderChildService;
+
     @RequestMapping(value="/tradeOrder",method = RequestMethod.POST)
     @ResponseBody
     @ApiOperation(value = "退款交易订单")

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) {

service/src/main/java/com/hfkj/dao/BsUserMapper.java

@@ -43,14 +43,14 @@ public interface BsUserMapper extends BsUserMapperExt {
         "phone, `password`, ",
         "integral, `status`, ",
         "wx_mp_openid, wx_ma_openid, ",
-        "v_family_openid, create_time, ",
+        "outside_openid, create_time, ",
         "update_time, ext_1, ",
         "ext_2, ext_3)",
         "values (#{headImg,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, ",
         "#{phone,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, ",
         "#{integral,jdbcType=BIGINT}, #{status,jdbcType=INTEGER}, ",
         "#{wxMpOpenid,jdbcType=VARCHAR}, #{wxMaOpenid,jdbcType=VARCHAR}, ",
-        "#{vFamilyOpenid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ",
+        "#{outsideOpenid,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, ",
         "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ",
         "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})"
     })
@@ -72,7 +72,7 @@ public interface BsUserMapper extends BsUserMapperExt {
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="wx_mp_openid", property="wxMpOpenid", jdbcType=JdbcType.VARCHAR),
         @Result(column="wx_ma_openid", property="wxMaOpenid", jdbcType=JdbcType.VARCHAR),
-        @Result(column="v_family_openid", property="vFamilyOpenid", jdbcType=JdbcType.VARCHAR),
+        @Result(column="outside_openid", property="outsideOpenid", jdbcType=JdbcType.VARCHAR),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@@ -84,7 +84,7 @@ public interface BsUserMapper extends BsUserMapperExt {
     @Select({
         "select",
         "id, head_img, `name`, phone, `password`, integral, `status`, wx_mp_openid, wx_ma_openid, ",
-        "v_family_openid, create_time, update_time, ext_1, ext_2, ext_3",
+        "outside_openid, create_time, update_time, ext_1, ext_2, ext_3",
         "from bs_user",
         "where id = #{id,jdbcType=BIGINT}"
     })
@@ -98,7 +98,7 @@ public interface BsUserMapper extends BsUserMapperExt {
         @Result(column="status", property="status", jdbcType=JdbcType.INTEGER),
         @Result(column="wx_mp_openid", property="wxMpOpenid", jdbcType=JdbcType.VARCHAR),
         @Result(column="wx_ma_openid", property="wxMaOpenid", jdbcType=JdbcType.VARCHAR),
-        @Result(column="v_family_openid", property="vFamilyOpenid", jdbcType=JdbcType.VARCHAR),
+        @Result(column="outside_openid", property="outsideOpenid", jdbcType=JdbcType.VARCHAR),
         @Result(column="create_time", property="createTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="update_time", property="updateTime", jdbcType=JdbcType.TIMESTAMP),
         @Result(column="ext_1", property="ext1", jdbcType=JdbcType.VARCHAR),
@@ -126,7 +126,7 @@ public interface BsUserMapper extends BsUserMapperExt {
           "`status` = #{status,jdbcType=INTEGER},",
           "wx_mp_openid = #{wxMpOpenid,jdbcType=VARCHAR},",
           "wx_ma_openid = #{wxMaOpenid,jdbcType=VARCHAR},",
-          "v_family_openid = #{vFamilyOpenid,jdbcType=VARCHAR},",
+          "outside_openid = #{outsideOpenid,jdbcType=VARCHAR},",
           "create_time = #{createTime,jdbcType=TIMESTAMP},",
           "update_time = #{updateTime,jdbcType=TIMESTAMP},",
           "ext_1 = #{ext1,jdbcType=VARCHAR},",

service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java

@@ -60,8 +60,8 @@ public class BsUserSqlProvider {
             sql.VALUES("wx_ma_openid", "#{wxMaOpenid,jdbcType=VARCHAR}");
         }
         
-        if (record.getvFamilyOpenid() != null) {
-            sql.VALUES("v_family_openid", "#{vFamilyOpenid,jdbcType=VARCHAR}");
+        if (record.getOutsideOpenid() != null) {
+            sql.VALUES("outside_openid", "#{outsideOpenid,jdbcType=VARCHAR}");
         }
         
         if (record.getCreateTime() != null) {
@@ -102,7 +102,7 @@ public class BsUserSqlProvider {
         sql.SELECT("`status`");
         sql.SELECT("wx_mp_openid");
         sql.SELECT("wx_ma_openid");
-        sql.SELECT("v_family_openid");
+        sql.SELECT("outside_openid");
         sql.SELECT("create_time");
         sql.SELECT("update_time");
         sql.SELECT("ext_1");
@@ -161,8 +161,8 @@ public class BsUserSqlProvider {
             sql.SET("wx_ma_openid = #{record.wxMaOpenid,jdbcType=VARCHAR}");
         }
         
-        if (record.getvFamilyOpenid() != null) {
-            sql.SET("v_family_openid = #{record.vFamilyOpenid,jdbcType=VARCHAR}");
+        if (record.getOutsideOpenid() != null) {
+            sql.SET("outside_openid = #{record.outsideOpenid,jdbcType=VARCHAR}");
         }
         
         if (record.getCreateTime() != null) {
@@ -202,7 +202,7 @@ public class BsUserSqlProvider {
         sql.SET("`status` = #{record.status,jdbcType=INTEGER}");
         sql.SET("wx_mp_openid = #{record.wxMpOpenid,jdbcType=VARCHAR}");
         sql.SET("wx_ma_openid = #{record.wxMaOpenid,jdbcType=VARCHAR}");
-        sql.SET("v_family_openid = #{record.vFamilyOpenid,jdbcType=VARCHAR}");
+        sql.SET("outside_openid = #{record.outsideOpenid,jdbcType=VARCHAR}");
         sql.SET("create_time = #{record.createTime,jdbcType=TIMESTAMP}");
         sql.SET("update_time = #{record.updateTime,jdbcType=TIMESTAMP}");
         sql.SET("ext_1 = #{record.ext1,jdbcType=VARCHAR}");
@@ -250,8 +250,8 @@ public class BsUserSqlProvider {
             sql.SET("wx_ma_openid = #{wxMaOpenid,jdbcType=VARCHAR}");
         }
         
-        if (record.getvFamilyOpenid() != null) {
-            sql.SET("v_family_openid = #{vFamilyOpenid,jdbcType=VARCHAR}");
+        if (record.getOutsideOpenid() != null) {
+            sql.SET("outside_openid = #{outsideOpenid,jdbcType=VARCHAR}");
         }
         
         if (record.getCreateTime() != null) {

service/src/main/java/com/hfkj/entity/BsUser.java

@@ -61,7 +61,7 @@ public class BsUser implements Serializable {
     /**
      * v家园openid
      */
-    private String vFamilyOpenid;
+    private String outsideOpenid;
 
     /**
      * 创建时间
@@ -153,12 +153,12 @@ public class BsUser implements Serializable {
         this.wxMaOpenid = wxMaOpenid;
     }
 
-    public String getvFamilyOpenid() {
-        return vFamilyOpenid;
+    public String getOutsideOpenid() {
+        return outsideOpenid;
     }
 
-    public void setvFamilyOpenid(String vFamilyOpenid) {
-        this.vFamilyOpenid = vFamilyOpenid;
+    public void setOutsideOpenid(String outsideOpenid) {
+        this.outsideOpenid = outsideOpenid;
     }
 
     public Date getCreateTime() {
@@ -222,7 +222,7 @@ public class BsUser implements Serializable {
             && (this.getStatus() == null ? other.getStatus() == null : this.getStatus().equals(other.getStatus()))
             && (this.getWxMpOpenid() == null ? other.getWxMpOpenid() == null : this.getWxMpOpenid().equals(other.getWxMpOpenid()))
             && (this.getWxMaOpenid() == null ? other.getWxMaOpenid() == null : this.getWxMaOpenid().equals(other.getWxMaOpenid()))
-            && (this.getvFamilyOpenid() == null ? other.getvFamilyOpenid() == null : this.getvFamilyOpenid().equals(other.getvFamilyOpenid()))
+            && (this.getOutsideOpenid() == null ? other.getOutsideOpenid() == null : this.getOutsideOpenid().equals(other.getOutsideOpenid()))
             && (this.getCreateTime() == null ? other.getCreateTime() == null : this.getCreateTime().equals(other.getCreateTime()))
             && (this.getUpdateTime() == null ? other.getUpdateTime() == null : this.getUpdateTime().equals(other.getUpdateTime()))
             && (this.getExt1() == null ? other.getExt1() == null : this.getExt1().equals(other.getExt1()))
@@ -243,7 +243,7 @@ public class BsUser implements Serializable {
         result = prime * result + ((getStatus() == null) ? 0 : getStatus().hashCode());
         result = prime * result + ((getWxMpOpenid() == null) ? 0 : getWxMpOpenid().hashCode());
         result = prime * result + ((getWxMaOpenid() == null) ? 0 : getWxMaOpenid().hashCode());
-        result = prime * result + ((getvFamilyOpenid() == null) ? 0 : getvFamilyOpenid().hashCode());
+        result = prime * result + ((getOutsideOpenid() == null) ? 0 : getOutsideOpenid().hashCode());
         result = prime * result + ((getCreateTime() == null) ? 0 : getCreateTime().hashCode());
         result = prime * result + ((getUpdateTime() == null) ? 0 : getUpdateTime().hashCode());
         result = prime * result + ((getExt1() == null) ? 0 : getExt1().hashCode());
@@ -267,7 +267,7 @@ public class BsUser implements Serializable {
         sb.append(", status=").append(status);
         sb.append(", wxMpOpenid=").append(wxMpOpenid);
         sb.append(", wxMaOpenid=").append(wxMaOpenid);
-        sb.append(", vFamilyOpenid=").append(vFamilyOpenid);
+        sb.append(", outsideOpenid=").append(outsideOpenid);
         sb.append(", createTime=").append(createTime);
         sb.append(", updateTime=").append(updateTime);
         sb.append(", ext1=").append(ext1);

service/src/main/java/com/hfkj/entity/BsUserExample.java

@@ -725,73 +725,73 @@ public class BsUserExample {
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidIsNull() {
-            addCriterion("v_family_openid is null");
+        public Criteria andOutsideOpenidIsNull() {
+            addCriterion("outside_openid is null");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidIsNotNull() {
-            addCriterion("v_family_openid is not null");
+        public Criteria andOutsideOpenidIsNotNull() {
+            addCriterion("outside_openid is not null");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidEqualTo(String value) {
-            addCriterion("v_family_openid =", value, "vFamilyOpenid");
+        public Criteria andOutsideOpenidEqualTo(String value) {
+            addCriterion("outside_openid =", value, "outsideOpenid");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidNotEqualTo(String value) {
-            addCriterion("v_family_openid <>", value, "vFamilyOpenid");
+        public Criteria andOutsideOpenidNotEqualTo(String value) {
+            addCriterion("outside_openid <>", value, "outsideOpenid");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidGreaterThan(String value) {
-            addCriterion("v_family_openid >", value, "vFamilyOpenid");
+        public Criteria andOutsideOpenidGreaterThan(String value) {
+            addCriterion("outside_openid >", value, "outsideOpenid");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidGreaterThanOrEqualTo(String value) {
-            addCriterion("v_family_openid >=", value, "vFamilyOpenid");
+        public Criteria andOutsideOpenidGreaterThanOrEqualTo(String value) {
+            addCriterion("outside_openid >=", value, "outsideOpenid");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidLessThan(String value) {
-            addCriterion("v_family_openid <", value, "vFamilyOpenid");
+        public Criteria andOutsideOpenidLessThan(String value) {
+            addCriterion("outside_openid <", value, "outsideOpenid");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidLessThanOrEqualTo(String value) {
-            addCriterion("v_family_openid <=", value, "vFamilyOpenid");
+        public Criteria andOutsideOpenidLessThanOrEqualTo(String value) {
+            addCriterion("outside_openid <=", value, "outsideOpenid");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidLike(String value) {
-            addCriterion("v_family_openid like", value, "vFamilyOpenid");
+        public Criteria andOutsideOpenidLike(String value) {
+            addCriterion("outside_openid like", value, "outsideOpenid");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidNotLike(String value) {
-            addCriterion("v_family_openid not like", value, "vFamilyOpenid");
+        public Criteria andOutsideOpenidNotLike(String value) {
+            addCriterion("outside_openid not like", value, "outsideOpenid");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidIn(List<String> values) {
-            addCriterion("v_family_openid in", values, "vFamilyOpenid");
+        public Criteria andOutsideOpenidIn(List<String> values) {
+            addCriterion("outside_openid in", values, "outsideOpenid");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidNotIn(List<String> values) {
-            addCriterion("v_family_openid not in", values, "vFamilyOpenid");
+        public Criteria andOutsideOpenidNotIn(List<String> values) {
+            addCriterion("outside_openid not in", values, "outsideOpenid");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidBetween(String value1, String value2) {
-            addCriterion("v_family_openid between", value1, value2, "vFamilyOpenid");
+        public Criteria andOutsideOpenidBetween(String value1, String value2) {
+            addCriterion("outside_openid between", value1, value2, "outsideOpenid");
             return (Criteria) this;
         }
 
-        public Criteria andVFamilyOpenidNotBetween(String value1, String value2) {
-            addCriterion("v_family_openid not between", value1, value2, "vFamilyOpenid");
+        public Criteria andOutsideOpenidNotBetween(String value1, String value2) {
+            addCriterion("outside_openid not between", value1, value2, "outsideOpenid");
             return (Criteria) this;
         }
 

service/src/main/java/com/hfkj/qianzhu/channel/CinemaService.java

@@ -238,7 +238,7 @@ public class CinemaService {
         if (object.getBoolean("success") && object.getInteger("code") == 10000) {
             return object;
         } else {
-            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, object.getInteger("code"));
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, object);
         }
 
     }
@@ -282,7 +282,7 @@ public class CinemaService {
         if (object.getBoolean("success") && object.getInteger("code") == 10000) {
             return object;
         } else {
-            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "查询失败！");
+            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, object);
         }
 
     }

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);
     }
 }

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 {

service/src/main/java/com/hfkj/service/order/OrderRefundSuccessService.java

@@ -47,7 +47,8 @@ public class OrderRefundSuccessService {
                 cinema(orderChild);
             }
         } catch (Exception e) {
-
+            System.out.println("=========================================");
+            System.out.println(e.getMessage());
         }
     }
 
@@ -62,11 +63,12 @@ public class OrderRefundSuccessService {
                 map.put("orderNo", childOrder.getOrderNo());
                 CinemaService.refundMovieOrder(map);
                 orderCinema.setStatus(-5);
-                bsOrderCinemaService.update(orderCinema);
+                orderCinema.setExceptionStatus(false);
             }
         } catch (Exception e) {
             orderCinema.setExceptionStatus(true);
             orderCinema.setExceptionMsg(e.getMessage());
+        } finally {
             bsOrderCinemaService.update(orderCinema);
         }
 

service/src/main/java/com/hfkj/service/order/impl/BsOrderRefundServiceImpl.java

@@ -161,6 +161,7 @@ public class BsOrderRefundServiceImpl implements BsOrderRefundService {
         if (order == null) {
             throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知的交易订单");
         }
+
         // 创建退款订单
         BsOrderRefund orderRefund = new BsOrderRefund();
         orderRefund.setMerId(orderChild.getMerId());

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"));
                }
 

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", "");

service/src/main/java/com/hfkj/service/user/BsUserService.java

@@ -40,7 +40,7 @@ public interface BsUserService {
      * @param vFamilyOpenid 手机号
      * @return
      */
-    BsUser getUserByVFamilyOpenid(String vFamilyOpenid);
+    BsUser getUserByOutsideOpenid(String vFamilyOpenid);
 
 
     /**

service/src/main/java/com/hfkj/service/user/impl/BsUserServiceImpl.java

@@ -79,10 +79,10 @@ public class BsUserServiceImpl implements BsUserService {
     }
 
     @Override
-    public BsUser getUserByVFamilyOpenid(String vFamilyOpenid) {
+    public BsUser getUserByOutsideOpenid(String outsideOpenid) {
         BsUserExample example = new BsUserExample();
         example.createCriteria()
-                .andVFamilyOpenidEqualTo(vFamilyOpenid)
+                .andOutsideOpenidEqualTo(outsideOpenid)
                 .andStatusNotEqualTo(UserStatusEnum.status0.getCode());
         List<BsUser> list = userMapper.selectByExample(example);
         if (!list.isEmpty()) {
@@ -129,15 +129,13 @@ public class BsUserServiceImpl implements BsUserService {
         }
         BsUser user = new BsUser();
         user.setPhone(phone);
+        user.setName("嗨用户");
         user.setPassword(password);
         user.setIntegral(0L);
         user.setWxMaOpenid(MapUtils.getString(other, "maOpenId"));
         user.setWxMpOpenid(MapUtils.getString(other, "mpOpenId"));
         user.setStatus(UserStatusEnum.status1.getCode());
         editData(user);
-
-        user.setName("用户"+user.getId());
-        editData(user);
         return user;
     }
 
@@ -145,15 +143,13 @@ public class BsUserServiceImpl implements BsUserService {
     public BsUser register(String outsideOpenid, Map<String, Object> other) {
         // 查询手机号
         BsUser user = new BsUser();
-        user.setvFamilyOpenid(outsideOpenid);
+        user.setOutsideOpenid(outsideOpenid);
+        user.setName("嗨用户");
         user.setIntegral(0L);
         user.setWxMaOpenid(MapUtils.getString(other, "maOpenId"));
         user.setWxMpOpenid(MapUtils.getString(other, "mpOpenId"));
         user.setStatus(UserStatusEnum.status1.getCode());
         editData(user);
-
-        user.setName("用户"+user.getId());
-        editData(user);
         return user;
     }
 
@@ -186,7 +182,7 @@ public class BsUserServiceImpl implements BsUserService {
 
     @Override
     public SessionObject login(UserLoginPlatform platform, UserLoginType loginType,  String outsideOpenid, Map<String, Object> other) throws Exception {
-        BsUser user = getUserByVFamilyOpenid(outsideOpenid);
+        BsUser user = getUserByOutsideOpenid(outsideOpenid);
         if (user == null  ) {
             user = register(outsideOpenid, other);
         }
@@ -195,6 +191,15 @@ public class BsUserServiceImpl implements BsUserService {
         UserSessionObject session = new UserSessionObject();
         session.setUser(user);
 
+        // 查询汇联通工会卡
+        List<BsUserCard> 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);
         // 异步记录登录信息

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;

user/src/main/java/com/user/controller/BsUserController.java

@@ -130,7 +130,7 @@ public class BsUserController {
                 log.error("LoginController --> phone() error!", "请求参数校验失败");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.REQ_PARAMS_ERROR, "");
             }
-            String vFamilyOpenid = body.getString("vFamilyOpenid");
+            String outsideOpenid = body.getString("outsideOpenid");
 
             // 客户端
             UserLoginPlatform platform = UserLoginPlatform.getDataByType(body.getString("platform"));
@@ -146,12 +146,8 @@ public class BsUserController {
             }
 
             // 账户密码登录
-            if (body.getString("type").equals(UserLoginType.V_FAMILY_OPENID.getCode())) {
-
             Map<String, Object> other = new HashMap<>();
-                return ResponseMsgUtil.success(userService.login(platform, loginType, vFamilyOpenid, other));
-            }
-            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "登录失败");
+            return ResponseMsgUtil.success(userService.login(platform, loginType, outsideOpenid, other));
 
         } catch (Exception e) {
             log.error("LoginController --> phone() error!", e);