修改h5端的包结构

carbon-h5/carbon-h5-common/src/main/java/com/hcloud/microserver/facade/carbon/vo/MyWxMpUser.java

@@ -0,0 +1,12 @@
+package com.hcloud.microserver.facade.carbon.vo;
+
+import lombok.Data;
+import me.chanjar.weixin.mp.bean.result.WxMpUser;
+
+@Data
+public class MyWxMpUser extends WxMpUser {
+
+    private String code;
+
+    private String phone;
+}

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/CarbonH5ServiceApplication.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank;
+package com.hcloud.microserver.h5;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/biz/RedisMessageListener.java

@@ -1,6 +1,6 @@
-package com.hcloud.microserver.bank.biz;
+package com.hcloud.microserver.h5.biz;
 
-import com.hcloud.microserver.bank.service.OrderInfoService;
+import com.hcloud.microserver.h5.service.OrderInfoService;
 import com.hcloud.microserver.facade.carbon.forms.GoodsOrderInfoForm;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/biz/SmsComponent.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.biz;
+package com.hcloud.microserver.h5.biz;
 
 import com.hcloud.microserver.commoncore.base.ResultVO;
 import com.hcloud.microserver.commoncore.enums.ResultEnum;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/biz/WechatManagerComponent.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.bank.biz;
+package com.hcloud.microserver.h5.biz;
 
-import com.hcloud.microserver.bank.config.WxMpConfiguration;
-import com.hcloud.microserver.bank.service.CustomerInfoService;
+import com.hcloud.microserver.h5.config.WxMpConfiguration;
+import com.hcloud.microserver.h5.service.CustomerInfoService;
 import com.hcloud.microserver.commoncore.base.Token;
 import com.hcloud.microserver.commoncore.constant.GlobleConstant;
 import com.hcloud.microserver.commoncore.service.RedisUtils;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/CompanyBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/CredentialInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/CustomerDetails.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 
 import com.hcloud.microserver.facade.carbon.entity.CustomerInfo;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/CustomerInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/FarmerInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/GoodsDetailBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/GoodsInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import com.hcloud.microserver.facade.carbon.entity.GoodsDetail;
 import com.hcloud.microserver.facade.carbon.entity.ProductInfo;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/GoodsPayOrderBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/OrderDetailBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/OrderDetailInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/OrderInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/OrderPayApplyBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/PayApplyInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/PayVoucherBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/PaymentBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/PovertyAreaBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/ProductBelongBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/ProductExpansionBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/ProductInfoBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/ProductTypeBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/ProductTypeExpansionBO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/bo/WebLog.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.bo;
+package com.hcloud.microserver.h5.bo;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/common/BaseInfoDO.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.common;
+package com.hcloud.microserver.h5.common;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/common/CarbonBaseController.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.common;
+package com.hcloud.microserver.h5.common;
 
 import com.alibaba.fastjson.JSONObject;
 import com.hcloud.microserver.commoncore.base.BaseController;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/common/NormalController.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.bank.common;
+package com.hcloud.microserver.h5.common;
 
-import com.hcloud.microserver.bank.biz.SmsComponent;
-import com.hcloud.microserver.bank.biz.WechatManagerComponent;
+import com.hcloud.microserver.h5.biz.SmsComponent;
+import com.hcloud.microserver.h5.biz.WechatManagerComponent;
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.base.ResultVO;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/common/PageForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.common;
+package com.hcloud.microserver.h5.common;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/component/BindingResultAspect.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.component;
+package com.hcloud.microserver.h5.component;
 
 import com.hcloud.microserver.commoncore.base.CommonResult;
 import org.aspectj.lang.ProceedingJoinPoint;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/component/WebLogAspect.java

@@ -1,9 +1,9 @@
-package com.hcloud.microserver.bank.component;
+package com.hcloud.microserver.h5.component;
 
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.URLUtil;
 import cn.hutool.json.JSONUtil;
-import com.hcloud.microserver.bank.bo.WebLog;
+import com.hcloud.microserver.h5.bo.WebLog;
 import io.swagger.annotations.ApiOperation;
 import net.logstash.logback.marker.Markers;
 import org.aspectj.lang.JoinPoint;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/GlobalCorsConfig.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
 
 /**

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/MallSecurityConfig.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
 
-import com.hcloud.microserver.bank.service.CustomerService;
+import com.hcloud.microserver.h5.service.CustomerService;
 import com.hcloud.microserver.security.config.SecurityConfig;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/MyBatisConfig.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.context.annotation.Configuration;
@@ -10,6 +10,6 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
  */
 @Configuration
 @EnableTransactionManagement
-@MapperScan({"com.hcloud.microserver.bank.dao"})
+@MapperScan({"com.hcloud.microserver.h5.dao"})
 public class MyBatisConfig {
 }

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/PubsubConfiguration.java

@@ -1,6 +1,6 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
-import com.hcloud.microserver.bank.biz.RedisMessageListener;
+import com.hcloud.microserver.h5.biz.RedisMessageListener;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/SmsConfiguration.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
 import com.hcloud.microserver.commoncore.util.SMSUtil;
 import org.springframework.beans.factory.annotation.Value;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/Swagger2Config.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
 import com.github.xiaoymin.knife4j.spring.annotations.EnableKnife4j;
 import org.springframework.context.annotation.Bean;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurationSupport;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/WxMaConfiguration.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/WxMpConfiguration.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
 
 import com.google.common.collect.Maps;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/WxMpProperties.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
 
 import com.hcloud.microserver.commoncore.util.JsonUtils;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/WxPayConfiguration.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/config/WxPayProperties.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.config;
+package com.hcloud.microserver.h5.config;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/controller/web/CustomerController.java

@@ -1,12 +1,12 @@
-package com.hcloud.microserver.bank.controller.web;
-
-import com.hcloud.microserver.bank.forms.CompanyValidateForm;
-import com.hcloud.microserver.bank.forms.LoginForm;
-import com.hcloud.microserver.bank.forms.PersonValidateForm;
-import com.hcloud.microserver.bank.forms.SmallCustomer;
-import com.hcloud.microserver.bank.service.CustomerCompanyInfoService;
-import com.hcloud.microserver.bank.service.CustomerInfoService;
-import com.hcloud.microserver.bank.service.CustomerService;
+package com.hcloud.microserver.h5.controller.web;
+
+import com.hcloud.microserver.h5.forms.CompanyValidateForm;
+import com.hcloud.microserver.h5.forms.LoginForm;
+import com.hcloud.microserver.h5.forms.PersonValidateForm;
+import com.hcloud.microserver.h5.forms.SmallCustomer;
+import com.hcloud.microserver.h5.service.CustomerCompanyInfoService;
+import com.hcloud.microserver.h5.service.CustomerInfoService;
+import com.hcloud.microserver.h5.service.CustomerService;
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/controller/web/FarmerManagerController.java

@@ -1,10 +1,10 @@
-package com.hcloud.microserver.bank.controller.web;
+package com.hcloud.microserver.h5.controller.web;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.common.CarbonBaseController;
-import com.hcloud.microserver.bank.service.FarmerInfoService;
-import com.hcloud.microserver.bank.service.PovertyAreaService;
+import com.hcloud.microserver.h5.common.CarbonBaseController;
+import com.hcloud.microserver.h5.service.FarmerInfoService;
+import com.hcloud.microserver.h5.service.PovertyAreaService;
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.base.ResultVO;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/controller/web/GoodsManagerController.java

@@ -1,15 +1,15 @@
-package com.hcloud.microserver.bank.controller.web;
+package com.hcloud.microserver.h5.controller.web;
 
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
-import com.hcloud.microserver.bank.bo.GoodsInfoBO;
-import com.hcloud.microserver.bank.common.BaseInfoDO;
-import com.hcloud.microserver.bank.common.CarbonBaseController;
-import com.hcloud.microserver.bank.forms.FarmerQueryForm;
-import com.hcloud.microserver.bank.forms.GoodsCarForm;
-import com.hcloud.microserver.bank.forms.GoodsQueryForm;
-import com.hcloud.microserver.bank.service.GoodsInfoService;
-import com.hcloud.microserver.bank.service.ProductTypeService;
+import com.hcloud.microserver.h5.bo.GoodsInfoBO;
+import com.hcloud.microserver.h5.common.BaseInfoDO;
+import com.hcloud.microserver.h5.common.CarbonBaseController;
+import com.hcloud.microserver.h5.forms.FarmerQueryForm;
+import com.hcloud.microserver.h5.forms.GoodsCarForm;
+import com.hcloud.microserver.h5.forms.GoodsQueryForm;
+import com.hcloud.microserver.h5.service.GoodsInfoService;
+import com.hcloud.microserver.h5.service.ProductTypeService;
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.base.ResultVO;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/controller/web/OrderManagerController.java

@@ -1,12 +1,12 @@
-package com.hcloud.microserver.bank.controller.web;
+package com.hcloud.microserver.h5.controller.web;
 
 import com.github.pagehelper.PageInfo;
 import com.google.common.collect.Lists;
-import com.hcloud.microserver.bank.bo.CredentialInfoBO;
-import com.hcloud.microserver.bank.common.BaseInfoDO;
-import com.hcloud.microserver.bank.common.CarbonBaseController;
-import com.hcloud.microserver.bank.forms.OrderQueryForm;
-import com.hcloud.microserver.bank.service.*;
+import com.hcloud.microserver.h5.bo.CredentialInfoBO;
+import com.hcloud.microserver.h5.common.BaseInfoDO;
+import com.hcloud.microserver.h5.common.CarbonBaseController;
+import com.hcloud.microserver.h5.forms.OrderQueryForm;
+import com.hcloud.microserver.h5.service.*;
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.base.ResultVO;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/controller/web/WechatAppController.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.controller.web;
+package com.hcloud.microserver.h5.controller.web;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.bean.WxMaJscode2SessionResult;
@@ -9,7 +9,7 @@ import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
-import com.hcloud.microserver.bank.service.CustomerInfoService;
+import com.hcloud.microserver.h5.service.CustomerInfoService;
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
 import com.hcloud.microserver.commoncore.base.BaseController;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
@@ -39,7 +39,6 @@ import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.PrintWriter;
-import java.math.BigDecimal;
 import java.security.GeneralSecurityException;
 import java.util.HashMap;
 import java.util.Map;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/controller/web/WechatManagerController.java

@@ -1,16 +1,16 @@
-package com.hcloud.microserver.bank.controller.web;
+package com.hcloud.microserver.h5.controller.web;
 
 import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyResult;
 import com.github.binarywang.wxpay.bean.request.WxPayUnifiedOrderRequest;
 import com.github.binarywang.wxpay.constant.WxPayConstants;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
-import com.hcloud.microserver.bank.biz.WechatManagerComponent;
-import com.hcloud.microserver.bank.common.BaseInfoDO;
-import com.hcloud.microserver.bank.common.CarbonBaseController;
-import com.hcloud.microserver.bank.config.WxMpConfiguration;
-import com.hcloud.microserver.bank.service.OrderInfoService;
-import com.hcloud.microserver.bank.service.OrderPayService;
+import com.hcloud.microserver.h5.biz.WechatManagerComponent;
+import com.hcloud.microserver.h5.common.BaseInfoDO;
+import com.hcloud.microserver.h5.common.CarbonBaseController;
+import com.hcloud.microserver.h5.config.WxMpConfiguration;
+import com.hcloud.microserver.h5.service.OrderInfoService;
+import com.hcloud.microserver.h5.service.OrderPayService;
 import com.hcloud.microserver.commoncore.annotation.AuthCarbonValidate;
 import com.hcloud.microserver.commoncore.base.ResponseBase;
 import com.hcloud.microserver.commoncore.base.ResultVO;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/BasePositionMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 
 import com.hcloud.microserver.commoncore.base.BaseMapper;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/CarbonCalculateRuleMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.CarbonCalculateRule;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/CarbonStatisticsMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.hcloud.microserver.facade.carbon.entity.CarbonPlatformStatiticsNum;
 import com.hcloud.microserver.facade.carbon.entity.CarbonStatisticsBuyTrend;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/CollectiveFarmerMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.github.pagehelper.Page;
 import com.hcloud.microserver.commoncore.base.BaseMapper;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/CustomerChannelMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.CustomerChannel;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/CustomerCompanyInfoMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.github.pagehelper.Page;
 import com.hcloud.microserver.commoncore.base.BaseMapper;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/CustomerInfoMapper.java

@@ -1,6 +1,6 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
-import com.hcloud.microserver.bank.bo.CustomerInfoBO;
+import com.hcloud.microserver.h5.bo.CustomerInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.facade.carbon.entity.CustomerInfo;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/FarmerInfoMapper.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.github.pagehelper.Page;
-import com.hcloud.microserver.bank.bo.FarmerInfoBO;
+import com.hcloud.microserver.h5.bo.FarmerInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.FarmerInfo;
 import com.hcloud.microserver.facade.carbon.forms.FarmerInfoForm;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/GoodsCredentialInfoMapper.java

@@ -1,6 +1,6 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
-import com.hcloud.microserver.bank.bo.CredentialInfoBO;
+import com.hcloud.microserver.h5.bo.CredentialInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.GoodsCredentialInfo;
 import org.apache.ibatis.annotations.Param;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/GoodsDetailMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.GoodsDetail;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/GoodsInfoMapper.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.github.pagehelper.Page;
-import com.hcloud.microserver.bank.bo.GoodsInfoBO;
+import com.hcloud.microserver.h5.bo.GoodsInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.facade.carbon.entity.GoodsInfo;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/GoodsOrderDetailMapper.java

@@ -1,6 +1,6 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
-import com.hcloud.microserver.bank.bo.OrderDetailInfoBO;
+import com.hcloud.microserver.h5.bo.OrderDetailInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.GoodsOrderDetail;
 import org.apache.ibatis.annotations.Param;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/GoodsOrderInfoMapper.java

@@ -1,6 +1,6 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
-import com.hcloud.microserver.bank.bo.OrderInfoBO;
+import com.hcloud.microserver.h5.bo.OrderInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.facade.carbon.entity.GoodsOrderInfo;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/GoodsPayOrderMapper.java

@@ -1,6 +1,6 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
-import com.hcloud.microserver.bank.bo.PaymentBO;
+import com.hcloud.microserver.h5.bo.PaymentBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.GoodsPayOrder;
 import com.hcloud.microserver.facade.carbon.forms.PaymentForm;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/GoodsSaleInfoMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.GoodsSaleInfo;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/OrderPayApplyMapper.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.github.pagehelper.Page;
-import com.hcloud.microserver.bank.bo.PayApplyInfoBO;
+import com.hcloud.microserver.h5.bo.PayApplyInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.commoncore.base.PageBean;
 import com.hcloud.microserver.facade.carbon.entity.OrderPayApply;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/OrderPayVoucherMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.github.pagehelper.Page;
 import com.hcloud.microserver.commoncore.base.BaseMapper;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/PovertyAreaMapper.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.github.pagehelper.Page;
-import com.hcloud.microserver.bank.bo.PovertyAreaBO;
+import com.hcloud.microserver.h5.bo.PovertyAreaBO;
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.PovertyArea;
 import com.hcloud.microserver.facade.carbon.forms.PovertyAreaForm;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/ProductBelongMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.ProductBelong;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/ProductExpansionMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.ProductExpansion;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/ProductInfoMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.github.pagehelper.Page;
 import com.hcloud.microserver.commoncore.base.BaseMapper;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/ProductTypeExpansionMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.hcloud.microserver.commoncore.base.BaseMapper;
 import com.hcloud.microserver.facade.carbon.entity.ProductTypeExpansion;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/ProductTypeMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.github.pagehelper.Page;
 import com.hcloud.microserver.commoncore.base.BaseMapper;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/dao/WebIndexMapper.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.dao;
+package com.hcloud.microserver.h5.dao;
 
 import com.hcloud.microserver.facade.carbon.entity.DayCarbonBO;
 import com.hcloud.microserver.facade.carbon.entity.GroupNumBO;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/enums/LoginChannelEnum.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.enums;
+package com.hcloud.microserver.h5.enums;
 
 import lombok.Getter;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/events/CredentialInfoEvent.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.events;
+package com.hcloud.microserver.h5.events;
 
 import lombok.Getter;
 import org.springframework.context.ApplicationEvent;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/forms/CompanyValidateForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.forms;
+package com.hcloud.microserver.h5.forms;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/forms/FarmerQueryForm.java

@@ -1,6 +1,6 @@
-package com.hcloud.microserver.bank.forms;
+package com.hcloud.microserver.h5.forms;
 
-import com.hcloud.microserver.bank.common.PageForm;
+import com.hcloud.microserver.h5.common.PageForm;
 import lombok.Data;
 
 /**

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/forms/GoodsCarForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.forms;
+package com.hcloud.microserver.h5.forms;
 
 import com.hcloud.microserver.facade.carbon.forms.GoodsInfoForm;
 import lombok.Data;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/forms/GoodsQueryForm.java

@@ -1,6 +1,6 @@
-package com.hcloud.microserver.bank.forms;
+package com.hcloud.microserver.h5.forms;
 
-import com.hcloud.microserver.bank.common.PageForm;
+import com.hcloud.microserver.h5.common.PageForm;
 import lombok.Data;
 
 /**

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/forms/LoginForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.forms;
+package com.hcloud.microserver.h5.forms;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/forms/OrderQueryForm.java

@@ -1,6 +1,6 @@
-package com.hcloud.microserver.bank.forms;
+package com.hcloud.microserver.h5.forms;
 
-import com.hcloud.microserver.bank.common.PageForm;
+import com.hcloud.microserver.h5.common.PageForm;
 import lombok.Data;
 
 /**

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/forms/PersonValidateForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.forms;
+package com.hcloud.microserver.h5.forms;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/forms/SmallCustomer.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.forms;
+package com.hcloud.microserver.h5.forms;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/forms/WxLoginForm.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.forms;
+package com.hcloud.microserver.h5.forms;
 
 import lombok.Data;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/listens/BusinessListener.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.bank.listens;
+package com.hcloud.microserver.h5.listens;
 
-import com.hcloud.microserver.bank.events.CredentialInfoEvent;
-import com.hcloud.microserver.bank.service.CredentialInfoService;
+import com.hcloud.microserver.h5.events.CredentialInfoEvent;
+import com.hcloud.microserver.h5.service.CredentialInfoService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/BasePositionService.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
 import com.hcloud.microserver.commoncore.base.BaseServie;
 import com.hcloud.microserver.facade.carbon.entity.BasePosition;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/CarbonStatisticsService.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.facade.carbon.entity.CarbonPlatformStatiticsNum;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/CollectiveFarmerService.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.BaseServie;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/CompanyService.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
 import com.hcloud.microserver.commoncore.base.BaseServie;
 import com.hcloud.microserver.facade.carbon.entity.CustomerCompanyInfo;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/CredentialInfoService.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
 import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.bo.CredentialInfoBO;
+import com.hcloud.microserver.h5.bo.CredentialInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseServie;
 import com.hcloud.microserver.facade.carbon.forms.GoodsCredentialInfoForm;
 

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/CustomerCacheService.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
 
 import com.hcloud.microserver.facade.carbon.entity.CustomerInfo;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/CustomerCompanyInfoService.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.BaseServie;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/CustomerInfoService.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.BaseServie;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/CustomerService.java

@@ -1,8 +1,7 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
-import com.hcloud.microserver.bank.bo.CustomerDetails;
-import com.hcloud.microserver.bank.forms.LoginForm;
-import com.hcloud.microserver.facade.carbon.entity.CustomerInfo;
+import com.hcloud.microserver.h5.bo.CustomerDetails;
+import com.hcloud.microserver.h5.forms.LoginForm;
 import com.hcloud.microserver.facade.carbon.forms.CustomerInfoForm;
 
 public interface CustomerService {

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/FarmerInfoService.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
 import com.github.pagehelper.PageInfo;
 import com.hcloud.microserver.commoncore.base.BaseServie;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/GoodsDetailService.java

@@ -1,4 +1,4 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
 import com.hcloud.microserver.commoncore.base.BaseServie;
 import com.hcloud.microserver.facade.carbon.entity.GoodsDetail;

carbon-h5/carbon-h5-service/src/main/java/com/hcloud/microserver/bank/service/GoodsInfoService.java

@@ -1,7 +1,7 @@
-package com.hcloud.microserver.bank.service;
+package com.hcloud.microserver.h5.service;
 
 import com.github.pagehelper.PageInfo;
-import com.hcloud.microserver.bank.bo.GoodsInfoBO;
+import com.hcloud.microserver.h5.bo.GoodsInfoBO;
 import com.hcloud.microserver.commoncore.base.BaseServie;
 import com.hcloud.microserver.facade.carbon.entity.GoodsInfo;
 import com.hcloud.microserver.facade.carbon.entity.GoodsSaleInfo;