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/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,11 +41,10 @@ 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", "");
-        param.put("outRedirectPath", CommonSysConst.getSysConfig().getDomainName()+"/phg/#/pages/user/order_list/order_list?tbIndex=-1");
+        param.put("outRedirectPath", CommonSysConst.getSysConfig().getDomainName()+"/cweb/#/order/order/orderList");
         param.put("sign", HuiftConfig.md5Encode(HuiftConfig.paramSort(param, HuiftConfig.signSecret).getBytes()).toLowerCase());
         JSONObject response = HttpsUtils.doPost(HuiftConfig.reqUrl + "/hfq/v1/thirdPay/thirdPreOrder", JSONObject.toJSONString(param));
         if (response.getString("status").equals("ok")) {

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, outsideOpenid, other));
-                Map<String, Object> other = new HashMap<>();
-                return ResponseMsgUtil.success(userService.login(platform, loginType, vFamilyOpenid, other));
-            }
-            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "登录失败");
 
         } catch (Exception e) {
             log.error("LoginController --> phone() error!", e);