Merge remote-tracking branch 'origin/base-modify' into base-modify

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserDetail.java

@@ -74,4 +74,8 @@ public class AppUserDetail {
 	@ApiModelProperty(value = "邀请人账号:")
 	@Column(name = "inviter_account")
 	private  Integer inviterAccount;
+
+	@ApiModelProperty(value = "1-新人用户；2-未激活；3-激活")
+	@Column(name = "state")
+	private  Integer state;
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -63,7 +63,9 @@ public class AppUserDTO {
 	private  String code;
 
 	@ApiModelProperty(value = "邀请人id:")
-	private  String inviterAccount;
+	private  Integer inviterAccount;
+	@ApiModelProperty(value = "1-新人用户；2-未激活；3-激活:")
+	private  Integer state;
 	private Integer imUserid;
 	private String wxOpenid;
 	private String unionid;

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserInfoVo.java

@@ -38,4 +38,5 @@ public class AppUserInfoVo {
 	private Long updatetime;
 	private Integer isdel;
 
+
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/vo/AppUserVo.java

@@ -80,6 +80,9 @@ public class AppUserVo {
 	private  String code;
 
 	@ApiModelProperty(value = "邀请人id:")
-	private  String inviterAccount;
+	private  Integer inviterAccount;
+
+	@ApiModelProperty(value = "1-新人用户；2-未激活；3-激活:")
+	private  Integer state;
 
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/UserBusinessBiz.java

@@ -105,7 +105,7 @@ public class UserBusinessBiz {
         promoteBO.setActivatedNumber(memberStateAndCountMap.get(1));
 
         BigDecimal totalIncome = appUserSellingWaterBiz.selectTotalIncomeByUserId(userId);
-        promoteBO.setTotalIncome(totalIncome);
+        promoteBO.setTotalIncome(totalIncome==null?new BigDecimal(0):totalIncome);
         return promoteBO;
     }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/AppUserRest.java

@@ -144,8 +144,11 @@ public class AppUserRest {
 
 
     @RequestMapping(value = "/user/wxlogin")
-    public @ResponseBody JSONObject wxlogin(@RequestParam(value="openid",defaultValue="")String  openid,@RequestParam(value="isQQ",defaultValue="0")Integer isQQ) {
-        return appPermissionService.weCahtLogin(openid,isQQ);
+    public @ResponseBody JSONObject wxlogin(
+            @RequestParam(value="openid",defaultValue="")String  openid,
+            @RequestParam(value="isQQ",defaultValue="0")Integer isQQ,
+            @RequestParam(value="code",defaultValue="")String  code) {
+        return appPermissionService.weCahtLogin(openid,isQQ,code);
     }
 
     /**
@@ -162,10 +165,11 @@ public class AppUserRest {
             @RequestParam(value="username",defaultValue="")String  username,
             @RequestParam(value="mobilecode",defaultValue="")String mobilecode,
             @RequestParam(value="password",defaultValue="")String  password,
-            @RequestParam(value="type",defaultValue="1")Integer  type
+            @RequestParam(value="type",defaultValue="1")Integer  type,
+            @RequestParam(value="code",defaultValue="")String  code
     ){
 
-        return appPermissionService.login(username,password,mobilecode,type);
+        return appPermissionService.login(username,password,mobilecode,type,code);
     }
 
     @RequestMapping(value = "/user/reset", method = RequestMethod.POST)

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -17,7 +17,7 @@ WHERE
      </foreach>
     </select>
 
-    <select id="selectTotalIncomeByUserId">
+    <select id="selectTotalIncomeByUserId" resultType="java.math.BigDecimal">
         SELECT SUM(commission) FROM app_user_selling_water WHERE `user_id`=#{userId}
     </select>
 </mapper>
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/UserCouponController.java

@@ -36,7 +36,7 @@ public class UserCouponController extends ActivityBaseController<UserCouponBiz>
     @ApiOperation("我的优惠卷")
     @RequestMapping(value = "/coupon/list", method = RequestMethod.GET)
     public ObjectRestResponse list(@RequestParam(value = "type",defaultValue = "0") Integer type,
-                                   @RequestParam(value = "channel") Integer channel,
+                                   @RequestParam(value = "channel",required = false) Integer channel,
                                    @RequestParam(value = "amount",defaultValue = "0.00") BigDecimal amount) {
         AppUserDTO userInfo = getUserInfo();
         Integer userId = userInfo.getUserid();

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

@@ -28,6 +28,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
 
@@ -60,6 +61,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
 
     @Autowired
     MQServiceBiZ mqServiceBiZ;
+    @Value("${universal.url}")
+    String weixinHost;
 
     public JSONObject preparepay( OrderPayVo orderPayVo) {
         if(null == orderPayVo) {
@@ -89,7 +92,8 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper,OrderPay> {
     }
         Integer type=orderPayVo.getType();
         String jsParam="";
-        String  notify_url="https://"+ SystemConfig.weixinHost+"/api/universal/pay/app/unauth/notify";
+        String  notify_url=weixinHost+"/api/universal/pay/app/unauth/notify";
+        log.info("报名费回调路径notify_url:"+notify_url);
         if(type!=null&&type==2){
             jsParam=WXPay.webPay( amount+"",orderPayVo.getBody(),notify_url,trade_no,orderPayVo.getBuyerIp(), orderPayVo.getBuyerAccount());
         }else {