Merge branch 'dev_yy' into 2.0-dev

* dev_yy: (25 commits)
  提交代理商
  1
  1
  提交实物
  提交代码
  提交代码
  提交代码
  提交抽奖代码
  1
  提交代码
  提交代码
  提交代码
  提交代码
  提交代码
  提交
  1
  1
  修改首页没有积分专区
  提交代码
  修改小程序注册用券
  ...

# Conflicts:
#	hai-cweb/src/main/java/com/cweb/controller/HighTestController.java
#	hai-service/src/main/java/com/hai/common/utils/DateUtil.java
#	hai-service/src/main/java/com/hai/common/utils/RequestUtils.java
#	hai-service/src/main/java/com/hai/dao/HighChildOrderMapper.java
#	hai-service/src/main/java/com/hai/dao/HighChildOrderSqlProvider.java
#	hai-service/src/main/java/com/hai/dao/HighOrderMapperExt.java
#	hai-service/src/main/java/com/hai/entity/HighChildOrder.java
#	hai-service/src/main/java/com/hai/entity/HighChildOrderExample.java
#	hai-service/src/main/java/com/hai/entity/HighOrder.java
#	hai-service/src/main/java/com/hai/entity/OutRechargeOrder.java
#	hai-service/src/main/java/com/hai/service/HighUserService.java
#	hai-service/src/main/java/com/hai/service/OutRechargeOrderService.java
#	hai-service/src/main/java/com/hai/service/impl/BsDistributionUserRelServiceImpl.java
#	hai-service/src/main/java/com/hai/service/impl/HighUserServiceImpl.java
#	hai-service/src/main/java/com/hai/service/impl/OutRechargeOrderServiceImpl.java

hai-service/src/main/java/com/hai/model/UserInfoModel.java

@@ -36,6 +36,8 @@ public class UserInfoModel {
 	private HighTySalesman highTySalesman;
 	// 加油站员工
 	private HighGasStaff gasStaff;
+    // APi商户角色
+    private ApiMerchants apiMerchants;
 	// 权限列表
 	private List<SecPermission> permissionList;
 	// 菜单权限列表
@@ -133,6 +135,15 @@ public class UserInfoModel {
 		this.highAgent = highAgent;
 	}
 
+
+    public ApiMerchants getApiMerchants() {
+        return apiMerchants;
+    }
+
+    public void setApiMerchants(ApiMerchants apiMerchants) {
+        this.apiMerchants = apiMerchants;
+    }
+
     public HighTyAgent getHighTyAgent() {
 		return highTyAgent;
 	}

hai-service/src/main/java/com/hai/service/ApiOpenService.java

@@ -23,4 +23,14 @@ public interface ApiOpenService {
     */
     void createOrder(JSONObject object , ApiMerchants apiMerchants , ApiProductConfig productConfig) throws Exception;
 
+
+    /**
+     * @Author Sum1Dream
+     * @name createOrder.java
+     * @Description // 充值预下单
+     * @Date 17:31 2022/6/10
+     * @Param [com.alibaba.fastjson.JSONObject]
+     * @return com.alibaba.fastjson.JSONObject
+     */
+    void createOrder(JSONObject object , ApiMerchants apiMerchants) throws Exception;
 }

hai-service/src/main/java/com/hai/service/SecConfigService.java

@@ -2,6 +2,7 @@ package com.hai.service;
 
 import com.hai.entity.SecConfig;
 
+import java.util.List;
 import java.util.Map;
 import java.util.SortedMap;
 
@@ -70,4 +71,24 @@ public interface SecConfigService {
     */
     Boolean isSignVerify(Map<String, Object> map , String  sign) throws Exception;
 
+    /**
+     * @Author Sum1Dream
+     * @Name getSecConfigList
+     * @Description // 查询数据
+     * @Date 16:03 2022/12/7
+     * @Param [map]
+     * @Return java.util.List<com.hai.entity.SecConfig>
+     */
+    List<SecConfig> getSecConfigList(Map<String , Object> map);
+
+    /**
+     * @Author Sum1Dream
+     * @Name configMerchant
+     * @Description // 配置商户
+     * @Date 16:09 2022/12/7
+     * @Param [mchId, configProduct]
+     * @Return void
+     */
+    void configMerchant(String mchId , String configProduct);
+
 }

hai-service/src/main/java/com/hai/service/impl/ApiOpenServiceImpl.java

@@ -284,6 +284,264 @@ public class ApiOpenServiceImpl implements ApiOpenService {
 
     }
 
+    @Override
+    @Transactional(rollbackFor=Exception.class,isolation = Isolation.SERIALIZABLE,propagation= Propagation.REQUIRES_NEW)
+    public void createOrder(JSONObject object , ApiMerchants apiMerchants) throws  Exception {
+
+//        // 定义订单
+//        HighOrder highOrder = new HighOrder();
+//        highOrder.setMerchId(apiMerchants.getMchId());
+//        highOrder.setWhetherRebate(false);
+//        highOrder.setMemPhone(apiMerchants.getPhone());
+//        highOrder.setMemName(apiMerchants.getMerchantName());
+//        highOrder.setMemId(apiMerchants.getId());
+//        highOrder.setCreateTime(new Date());
+//        highOrder.setOrderStatus(1);
+//        highOrder.setProductType(object.getInteger("productType"));
+//        highOrder.setPayType(OrderPayTypeEnum.type8.getType());
+//        highOrder.setOrderNo("HF" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5));
+//        highOrderMapper.insert(highOrder);
+//
+//        // 订单总金额
+//        BigDecimal marketPriceTotal = new BigDecimal(0);
+//
+//        // 定义下单json对象
+//        JSONObject jsonObject;
+//
+//        // 获取token
+//        JSONObject userToken = QianZhuConfig.getTokenV2(apiMerchants.getId().toString(), apiMerchants.getMerchantName(), apiMerchants.getPhone());
+//
+//        if (!userToken.getBoolean("success")) {
+//            throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, userToken.getString("message"));
+//        }
+//
+//        // 1 星巴克 2 肯德基 3 会员充值
+//        if (object.getInteger("productType") == 1) {
+//
+//            // 判断当前商户是否有权限下单
+//            if (!secConfigService.isConfig("STARBUCKS_CONFIG" , object.getString("merchId"))) {
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前帐户无权限查询！");
+//            }
+//
+//            List<String> List = new ArrayList<>();
+//
+//            // 获取下单内容
+//            JSONArray array = object.getJSONArray("orderItems");
+//
+//            // 组装下单数据
+//            for (Object o : array) {
+//                JSONObject object1 = (JSONObject) o;
+//                Map<String, Object> contentMap = new LinkedHashMap<>();
+//                if (!object1.getString("productId").equals("")) {
+//                    contentMap.put("productId", object1.getString("productId"));
+//                }
+//                if (!object1.getString("cupSize").equals("")) {
+//                    contentMap.put("cupSize", object1.getString("cupSize"));
+//                }
+//                if (!object1.getString("temperature").equals("")) {
+//                    contentMap.put("temperature", object1.getString("temperature"));
+//                }
+//                if (!object1.getString("cream").equals("")) {
+//                    contentMap.put("cream", object1.getString("cream"));
+//                }
+//                if (!object1.getString("espresso").equals("")) {
+//                    contentMap.put("espresso", object1.getString("espresso"));
+//                }
+//                if (!object1.getString("milk").equals("")) {
+//                    contentMap.put("milk", object1.getString("milk"));
+//                }
+//                if (!object1.getString("milkBubble").equals("")) {
+//                    contentMap.put("milkBubble", object1.getString("milkBubble"));
+//                }
+//                if (!"".equals(object1.getString("num"))) {
+//                    contentMap.put("num", object1.getString("num"));
+//                }
+//                // 添加到LIST
+//                List.add(JSON.toJSONString(contentMap));
+//            }
+//
+//            // 下单
+//            jsonObject = QianZhuConfig.starbucksOrders(apiMerchants.getId().toString(), object.getString("storeCode"), List.toString().replace(" ", ""), object.getString("customerMobile"));
+//
+//            // 判断下单是否成功
+//            if (!Objects.equals(jsonObject.getString("code"), "200")) {
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message"));
+//            }
+//
+//            if (!jsonObject.getBoolean("success")) {
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message"));
+//            }
+//
+//            // 根据订单号查询订单详情
+//            JSONObject orderObject = QianZhuConfig.starbucksOrderByOrderNo(jsonObject.getJSONObject("data").getString("orderNo"));
+//
+//            // 判断是否成功
+//            if (!orderObject.getBoolean("success")) {
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message"));
+//            }
+//
+//            // 获取星巴克订单内容
+//            JSONArray starbucksOrder = orderObject.getJSONObject("data").getJSONArray("orderItems");
+//
+//
+//            // 循环获取星巴克订单
+//            for (Object starbucksObject : starbucksOrder) {
+//                JSONObject childObject = (JSONObject) starbucksObject;
+//                HighChildOrder childOrder = new HighChildOrder();
+//                childOrder.setOrderId(highOrder.getId());
+//                childOrder.setChildOrdeStatus(1);
+//                childOrder.setMemId(highOrder.getMemId());
+//                childOrder.setGoodsType(9);
+//                childOrder.setStoreId(object.getLong("storeCode"));
+//                childOrder.setGoodsId(childObject.getLong("id"));
+//                childOrder.setStoreAddress(childObject.getString("storeAddress"));
+//                childOrder.setStoreName(childObject.getString("storeName"));
+//                childOrder.setGoodsName(childObject.getString("productName"));
+//                childOrder.setGoodsImg(childObject.getString("imgUrl"));
+//                childOrder.setSaleCount(childObject.getInteger("quantity"));
+//                childOrder.setGoodsPrice(childObject.getBigDecimal("marketPrice"));
+//
+//                // 计算子订单支付金额
+//                BigDecimal childPrice = childObject.getBigDecimal("marketPrice");
+//                childOrder.setGoodsActualPrice(childPrice);
+//                // 计算市场价金额
+//                childOrder.setTotalPrice(childPrice.multiply(childObject.getBigDecimal("quantity")));
+//                marketPriceTotal = marketPriceTotal.add(childOrder.getTotalPrice());
+//
+//                highChildOrderMapper.insert(childOrder);
+//            }
+//            // 拼接json对象
+//            object.put("sourceType" , 5);
+//            object.put("content" , apiMerchants.getMerchantName() + "|" + "星巴克下单"  + "｜扣款" + marketPriceTotal);
+//        }else if (object.getInteger("productType") == 2) {
+//
+//            // 判断当前商户是否有肯德基下单权限
+//            if (!secConfigService.isConfig("KFC_CONFIG" , object.getString("merchId"))) {
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前帐户无权限查询！");
+//            }
+//            // 判断就餐方式
+//            if (object.getInteger("eatType") == null) {
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请选择就餐方式！");
+//            }
+//            // 下单
+//            jsonObject = QianZhuConfig.createKfcOrder(object.getInteger("eatType"), object.getString("storeCode"), object.getString("customerMobile"), object.getString("orderItems"), apiMerchants.getId().toString());
+//
+//            // 判断下单是否成功
+//            if (!Objects.equals(jsonObject.getString("code"), "10000")) {
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message"));
+//            }
+//
+//            // 根据订单号查询订单详情
+//            JSONObject orderObject = QianZhuConfig.getKfcOrderByOrderNo(jsonObject.getJSONObject("data").getString("orderNo"));
+//            // 判断下单是否成功
+//            if (!orderObject.getBoolean("success")) {
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, jsonObject.getString("message"));
+//            }
+//
+//            // 获取肯德基订单内容
+//            JSONArray kfcOrder = orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getJSONArray("items");
+//            for (Object kfcObject : kfcOrder) {
+//
+//                JSONObject childObject = (JSONObject) kfcObject;
+//                HighChildOrder childOrder = new HighChildOrder();
+//                childOrder.setOrderId(highOrder.getId());
+//                childOrder.setChildOrdeStatus(1);
+//                childOrder.setGoodsType(4);
+//                childOrder.setMemId(highOrder.getMemId());
+//                childOrder.setExt6(object.getString("storeCode"));
+//                childOrder.setGoodsId(childObject.getLong("productId"));
+//                childOrder.setStoreAddress(orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getString("storeAddress"));
+//                childOrder.setStoreName(orderObject.getJSONObject("data").getJSONObject("kfcPlaceOrder").getString("storeName"));
+//                childOrder.setGoodsName(childObject.getString("productName"));
+//                childOrder.setGoodsImg(childObject.getString("imageUrl"));
+//                childOrder.setSaleCount(childObject.getInteger("quantity"));
+//                childOrder.setGoodsPrice(childObject.getBigDecimal("originPrice"));
+//
+//                // 计算利润
+//                // 计算子订单支付金额
+//                BigDecimal childPrice = childObject.getBigDecimal("originPrice");
+//                childOrder.setGoodsActualPrice(childPrice);
+//                // 计算市场价金额
+//                childOrder.setTotalPrice(childPrice.multiply(childObject.getBigDecimal("quantity")));
+//                marketPriceTotal = marketPriceTotal.add(childOrder.getTotalPrice());
+//                highChildOrderMapper.insert(childOrder);
+//            }
+//            // 拼接json对象
+//            object.put("sourceType" , 4);
+//            object.put("content" , apiMerchants.getMerchantName() + "|" + "肯德基下单"  + "｜扣款" + marketPriceTotal);
+//        } else if (object.getInteger("productType") == 3) {
+//
+//            // 判断是否有会员充值下单权限
+//            if (!secConfigService.isConfig("MEMBER_RECHARGE_CONFIG" , object.getString("merchId"))) {
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.MERCHANT_NOT_AUTHORIZED, "当前帐户无权限查询！");
+//            }
+//
+//            // 获取会员充值
+//            ApiMemberProduct memberProduct = apiMemberProductService.findById(object.getLong("goodsId"));
+//
+//            if (memberProduct == null) {
+//                throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "当前产品不可购买");
+//            }
+//
+//            object.put("productId", memberProduct.getProductId());
+//
+//            HighChildOrder childOrder = new HighChildOrder();
+//            childOrder.setOrderId(highOrder.getId());
+//            childOrder.setChildOrdeStatus(1);
+//            childOrder.setGoodsType(10);
+//            childOrder.setStoreId(object.getLong("storeCode"));
+//            childOrder.setGoodsId(memberProduct.getId());
+//            childOrder.setGoodsName(memberProduct.getName());
+//            childOrder.setSaleCount(1);
+//            childOrder.setMemId(highOrder.getMemId());
+//            childOrder.setGoodsPrice(memberProduct.getPrice());
+//            childOrder.setGoodsActualPrice(memberProduct.getPrice());
+//            // 计算市场价金额
+//            childOrder.setTotalPrice(memberProduct.getPrice());
+//            marketPriceTotal = marketPriceTotal.add(childOrder.getTotalPrice());
+//            highChildOrderMapper.insert(childOrder);
+//            object.put("sourceType" , 6);
+//            object.put("content" , apiMerchants.getMerchantName() + "|" + "第三方会员充值下单"  + "｜扣款" + marketPriceTotal);
+//        }
+//        // 当前账号余额是否可以充值当前金额
+//        if (apiMerchants.getAmounts().compareTo(marketPriceTotal) < 0) {
+//            throw ErrorHelp.genException(SysCode.System, ErrorCode.INSUFFICIENT_BALANCE);
+//        }
+//
+//        highOrder.setTotalPrice(marketPriceTotal);
+//        highOrder.setPayPrice(marketPriceTotal);
+//        highOrder.setPayRealPrice(marketPriceTotal);
+//        highOrder.setPayablePrice(marketPriceTotal);
+//        ApiAmountRecord apiAmountRecord = apiMerchantAmount(highOrder , apiMerchants , object);
+//
+//        highOrder.setOrderStatus(2);
+//        highOrder.setPayTime(new Date());
+//        highOrder.setPaySerialNo("22" + DateUtil.date2String(new Date(), "yyyyMMddHHmmss") + IDGenerator.nextId(5));
+//        highOrderMapper.updateByPrimaryKey(highOrder);
+//
+//        // 更新子订单状态
+//        List<HighChildOrder> childOrderList = highOrderService.getChildOrderByOrder(highOrder.getId());
+//
+//        for (HighChildOrder highChildOrder : childOrderList) {
+//            highChildOrder.setChildOrdeStatus(2);
+//            highChildOrderMapper.updateByPrimaryKey(highChildOrder);
+//        }
+//
+//        // 插入订单记录
+//        ApiOrderRecord apiOrderRecordPost = new ApiOrderRecord();
+//        apiOrderRecordPost.setStatus(103);
+//        apiOrderRecordPost.setOrderNo(highOrder.getOrderNo());
+//        apiOrderRecordPost.setSourceOrderNo(apiAmountRecord.getSourceOrderNo());
+//        apiOrderRecordPost.setCreateTime(new Date());
+//        apiOrderRecordPost.setMchId(apiMerchants.getMchId());
+//        apiOrderRecordPost.setOrderId(highOrder.getId());
+//        apiOrderRecordPost.setGoodsId(apiMerchants.getMchId());
+//        apiOrderRecordPost.setNotifyUrl(object.getString("notifyUrl"));
+//        apiOrderRecordPost.setUpdateTime(new Date());
+//
+//        apiOrderRecordService.insertOrderRecord(apiOrderRecordPost);
+    }
+
     private ApiAmountRecord apiMerchantAmount(HighOrder highOrder , ApiMerchants apiMerchants , JSONObject object) throws Exception {
         // 插入金额记录
         // 变更前金额

hai-service/src/main/java/com/hai/service/impl/SecConfigServiceImpl.java

@@ -68,4 +68,39 @@ public class SecConfigServiceImpl implements SecConfigService {
         return signPost.equals(sign);
     }
 
+    @Override
+    public List<SecConfig> getSecConfigList(Map<String, Object> map) {
+        SecConfigExample example = new SecConfigExample();
+        SecConfigExample.Criteria criteria = example.createCriteria();
+
+        if (MapUtils.getString(map , "codeValue") != null) {
+            criteria.andCodeValueEqualTo(MapUtils.getString(map , "codeValue"));
+        }
+
+        return secConfigMapper.selectByExample(example);
+    }
+
+    @Override
+    public void configMerchant(String mchId, String configProduct) {
+        SecConfigExample example = new SecConfigExample();
+
+        example.createCriteria().andCodeValueEqualTo(mchId);
+
+        List<SecConfig> list = secConfigMapper.selectByExample(example);
+
+        // 删除当前所有配置
+        for (SecConfig secConfig : list) {
+            secConfigMapper.deleteByPrimaryKey(secConfig.getId());
+        }
+
+        String [] configProductArray = configProduct.split(",");
+
+        for (String s : configProductArray) {
+            SecConfig secConfig = new SecConfig();
+             secConfig.setCodeType(s);
+             secConfig.setCodeValue(mchId);
+             secConfigMapper.insert(secConfig);
+        }
+
+    }
 }

hai-user/target/maven-archiver/pom.properties

@@ -1,8 +1,4 @@
-<<<<<<< HEAD
 #Created by Apache Maven 3.8.2
-=======
-#Created by Apache Maven 3.6.3
->>>>>>> master
 version=1.0-SNAPSHOT
 groupId=com.hsg
 artifactId=hai-user

hai-user/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/RedisConfig.java
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/LoginController.java
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/WxMaConfiguration.java
@@ -18,24 +17,3 @@
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/CorsConfig.java
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/config/SysConfig.java
 /Volumes/work/code/high-work/high-service/hai-user/src/main/java/com/web/controller/DiscountController.java
-=======
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\WechatController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\SmsController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\MultipartConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\AuthConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SysConst.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\LoginController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\ConfigListener.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\LoginLogController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SysConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\RedisConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\CorsConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SentinelFilterConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\UserController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\TestController.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\type\LoginType.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\SwaggerConfig.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\UserApplication.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\config\WxMaConfiguration.java
-D:\hurui\huifu\hai-server\hai-user\src\main\java\com\web\controller\DiscountController.java
->>>>>>> master