From d800fb228893706708bea1095c64c72c9742f230 Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Wed, 30 Oct 2024 16:35:16 +0800 Subject: [PATCH 1/4] Merge branch 'master' of http://gitea.dctpay.com/hurui/youtao --- .../com/hfkj/controller/GoodsController.java | 27 +++++++++++--- .../com/hfkj/controller/TestController.java | 21 +++++++++++ .../hfkj/controller/notify/TaoBaoNotify.java | 35 +++++++++---------- .../main/java/com/hfkj/dao/BsUserMapper.java | 17 +-------- .../java/com/hfkj/dao/BsUserSqlProvider.java | 19 +--------- .../src/main/java/com/hfkj/entity/BsUser.java | 8 ++--- .../java/com/hfkj/entity/BsUserExample.java | 3 -- 7 files changed, 65 insertions(+), 65 deletions(-) diff --git a/cweb/src/main/java/com/hfkj/controller/GoodsController.java b/cweb/src/main/java/com/hfkj/controller/GoodsController.java index 13524fa..4db9f6f 100644 --- a/cweb/src/main/java/com/hfkj/controller/GoodsController.java +++ b/cweb/src/main/java/com/hfkj/controller/GoodsController.java @@ -7,11 +7,13 @@ import com.hfkj.common.exception.SysCode; import com.hfkj.common.security.UserCenter; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.entity.BsOrder; +import com.hfkj.entity.BsUser; import com.hfkj.model.*; import com.hfkj.service.goods.GoodsDataService; import com.hfkj.service.order.BsOrderService; import com.hfkj.service.pdd.PddService; import com.hfkj.service.taobao.TaoBaoService; +import com.hfkj.service.user.BsUserService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -37,6 +39,8 @@ public class GoodsController { private GoodsDataService goodsDataService; @Autowired private UserCenter userCenter; + @Resource + private BsUserService bsUserService; @@ -147,12 +151,25 @@ public class GoodsController { @RequestMapping(value="/publisher",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "淘宝客-公用-私域用户备案") - public ResponseData publisher(@RequestParam(value = "token" , required = false) String token + public ResponseData publisher(@RequestParam(value = "code" , required = false) String code ) { try { + // 用户session + UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class); + JSONObject tokenJson = TaoBaoService.getToken(code); + String token = tokenJson.getString("token_result"); + JSONObject tokenResult = JSONObject.parseObject(token); + + + JSONObject jsonObject = TaoBaoService.publisher(tokenResult.getString("access_token")); + String body = jsonObject.getString("body"); + JSONObject result = JSONObject.parseObject(body); + + BsUser user = bsUserService.getUser(userSession.getUser().getId()); + user.setSpecialId(result.getJSONObject("data").getString("relation_id")); + bsUserService.updateInfo(user); - JSONObject jsonObject = TaoBaoService.publisher(token); - return ResponseMsgUtil.success(jsonObject); + return ResponseMsgUtil.success("绑定成功"); } catch (Exception e) { log.error("error!",e); @@ -168,7 +185,9 @@ public class GoodsController { try { JSONObject jsonObject = TaoBaoService.getToken(code); - return ResponseMsgUtil.success(jsonObject); + String token = jsonObject.getString("token_result"); + JSONObject tokenResult = JSONObject.parseObject(token); + return ResponseMsgUtil.success(tokenResult); } catch (Exception e) { log.error("error!",e); diff --git a/cweb/src/main/java/com/hfkj/controller/TestController.java b/cweb/src/main/java/com/hfkj/controller/TestController.java index 81dd1f3..a5e1ae3 100644 --- a/cweb/src/main/java/com/hfkj/controller/TestController.java +++ b/cweb/src/main/java/com/hfkj/controller/TestController.java @@ -5,6 +5,7 @@ import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; +import com.hfkj.common.utils.HttpsUtils; import com.hfkj.common.utils.ResponseMsgUtil; import com.hfkj.model.ResponseData; @@ -157,6 +158,7 @@ public class TestController { otherParam.put("sourceOrderNo", System.currentTimeMillis()); userContributeService.purchase(rebate, userId, otherParam); + return ResponseMsgUtil.success("操作成功"); } catch (Exception e) { @@ -165,6 +167,25 @@ public class TestController { } } + @RequestMapping(value="/authorize",method = RequestMethod.GET) + @ResponseBody + @ApiOperation(value = "获取淘宝code") + public ResponseData authorize() { + try { + + + JSONObject object = HttpsUtils.doGet("https://oauth.taobao.com/authorize?response_type=code&client_id=34807616&redirect_uri=https://yuanqiyoutao.com/crest/taoBaoNotify/notify&state=1212&view=wap"); + + + return ResponseMsgUtil.success(object); + + } catch (Exception e) { + log.error("error!",e); + return ResponseMsgUtil.exception(e); + } + } + + } diff --git a/cweb/src/main/java/com/hfkj/controller/notify/TaoBaoNotify.java b/cweb/src/main/java/com/hfkj/controller/notify/TaoBaoNotify.java index 75ec422..8dd3d2b 100644 --- a/cweb/src/main/java/com/hfkj/controller/notify/TaoBaoNotify.java +++ b/cweb/src/main/java/com/hfkj/controller/notify/TaoBaoNotify.java @@ -1,16 +1,15 @@ package com.hfkj.controller.notify; import com.alibaba.fastjson.JSONObject; +import com.hfkj.common.utils.HttpsUtils; +import com.hfkj.config.CommonSysConst; import com.hfkj.service.taobao.TaoBaoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.PrintWriter; @@ -20,29 +19,29 @@ import java.io.PrintWriter; @Api(value = "淘宝业务通知") public class TaoBaoNotify { - private static Logger log = LoggerFactory.getLogger(TaoBaoService.class); + private static Logger log = LoggerFactory.getLogger(TaoBaoNotify.class); - @RequestMapping(value = "/notify", method = RequestMethod.POST) + @RequestMapping(value = "/notify", method = RequestMethod.GET) @ApiOperation(value = "回调") @ResponseBody - public void notify(@RequestBody String reqBodyStr, HttpServletResponse response) { + public void notify(@RequestParam("code") String code) { try { - JSONObject dataObject = JSONObject.parseObject(reqBodyStr, JSONObject.class); + System.out.println("============token回调任务Start============="); + System.out.println("============token回调任务code=============" + code); + JSONObject object = new JSONObject(); + object.put("code", code); +// JSONObject jsonObject = TaoBaoService.getToken(code); +// if (jsonObject.getBoolean("success")) { +// String token = jsonObject.getString("token_result"); +// JSONObject tokenResult = JSONObject.parseObject(token); +// System.out.println("============token回调任务jsonObject=============" + tokenResult); +// } - log.info("============淘宝回调任务Start============="); - log.info("淘宝-回调参数: " + dataObject); - log.info("============淘宝回调任务End============="); - - - response.setCharacterEncoding("UTF-8"); - response.setContentType("text/html;charset=utf-8"); - PrintWriter writer= response.getWriter(); - writer.write("SUCCESS"); } catch (Exception e) { - log.error("WechatPayController --> wechatNotify() error!", e); + log.error("TaoBaoNotify --> notify() error!", e); } } } diff --git a/service/src/main/java/com/hfkj/dao/BsUserMapper.java b/service/src/main/java/com/hfkj/dao/BsUserMapper.java index 8b5cb9c..b82a0f9 100644 --- a/service/src/main/java/com/hfkj/dao/BsUserMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsUserMapper.java @@ -41,7 +41,6 @@ public interface BsUserMapper extends BsUserMapperExt { @Insert({ "insert into bs_user (head_img, `name`, ", "phone, grade, wechat_num, ", -<<<<<<< HEAD "special_id, wechat_open_id, ", "wechat_unionid, elm_pid, ", "invite_user_id, invite_time, ", @@ -57,8 +56,7 @@ public interface BsUserMapper extends BsUserMapperExt { "#{partnerLevel,jdbcType=INTEGER}, #{partnerIncomePer,jdbcType=DECIMAL}, ", "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" -======= + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})", "wechat_open_id, wechat_unionid, ", "elm_pid, invite_user_id, ", "invite_time, partner_level, ", @@ -73,7 +71,6 @@ public interface BsUserMapper extends BsUserMapperExt { "#{partnerIncomePer,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, ", "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsUser record); @@ -90,10 +87,7 @@ public interface BsUserMapper extends BsUserMapperExt { @Result(column="phone", property="phone", jdbcType=JdbcType.VARCHAR), @Result(column="grade", property="grade", jdbcType=JdbcType.INTEGER), @Result(column="wechat_num", property="wechatNum", jdbcType=JdbcType.VARCHAR), -<<<<<<< HEAD @Result(column="special_id", property="specialId", jdbcType=JdbcType.VARCHAR), -======= ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 @Result(column="wechat_open_id", property="wechatOpenId", jdbcType=JdbcType.VARCHAR), @Result(column="wechat_unionid", property="wechatUnionid", jdbcType=JdbcType.VARCHAR), @Result(column="elm_pid", property="elmPid", jdbcType=JdbcType.VARCHAR), @@ -112,15 +106,12 @@ public interface BsUserMapper extends BsUserMapperExt { @Select({ "select", -<<<<<<< HEAD "id, head_img, `name`, phone, grade, wechat_num, special_id, wechat_open_id, ", "wechat_unionid, elm_pid, invite_user_id, invite_time, partner_level, partner_income_per, ", "`status`, create_time, update_time, ext_1, ext_2, ext_3", -======= "id, head_img, `name`, phone, grade, wechat_num, wechat_open_id, wechat_unionid, ", "elm_pid, invite_user_id, invite_time, partner_level, partner_income_per, `status`, ", "create_time, update_time, ext_1, ext_2, ext_3", ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 "from bs_user", "where id = #{id,jdbcType=BIGINT}" }) @@ -131,10 +122,7 @@ public interface BsUserMapper extends BsUserMapperExt { @Result(column="phone", property="phone", jdbcType=JdbcType.VARCHAR), @Result(column="grade", property="grade", jdbcType=JdbcType.INTEGER), @Result(column="wechat_num", property="wechatNum", jdbcType=JdbcType.VARCHAR), -<<<<<<< HEAD @Result(column="special_id", property="specialId", jdbcType=JdbcType.VARCHAR), -======= ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 @Result(column="wechat_open_id", property="wechatOpenId", jdbcType=JdbcType.VARCHAR), @Result(column="wechat_unionid", property="wechatUnionid", jdbcType=JdbcType.VARCHAR), @Result(column="elm_pid", property="elmPid", jdbcType=JdbcType.VARCHAR), @@ -167,10 +155,7 @@ public interface BsUserMapper extends BsUserMapperExt { "phone = #{phone,jdbcType=VARCHAR},", "grade = #{grade,jdbcType=INTEGER},", "wechat_num = #{wechatNum,jdbcType=VARCHAR},", -<<<<<<< HEAD "special_id = #{specialId,jdbcType=VARCHAR},", -======= ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 "wechat_open_id = #{wechatOpenId,jdbcType=VARCHAR},", "wechat_unionid = #{wechatUnionid,jdbcType=VARCHAR},", "elm_pid = #{elmPid,jdbcType=VARCHAR},", diff --git a/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java index 7cf9f7a..aa32fd1 100644 --- a/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java @@ -48,13 +48,10 @@ public class BsUserSqlProvider { sql.VALUES("wechat_num", "#{wechatNum,jdbcType=VARCHAR}"); } -<<<<<<< HEAD if (record.getSpecialId() != null) { sql.VALUES("special_id", "#{specialId,jdbcType=VARCHAR}"); } -======= ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 if (record.getWechatOpenId() != null) { sql.VALUES("wechat_open_id", "#{wechatOpenId,jdbcType=VARCHAR}"); } @@ -122,10 +119,7 @@ public class BsUserSqlProvider { sql.SELECT("phone"); sql.SELECT("grade"); sql.SELECT("wechat_num"); -<<<<<<< HEAD sql.SELECT("special_id"); -======= ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 sql.SELECT("wechat_open_id"); sql.SELECT("wechat_unionid"); sql.SELECT("elm_pid"); @@ -179,14 +173,9 @@ public class BsUserSqlProvider { if (record.getWechatNum() != null) { sql.SET("wechat_num = #{record.wechatNum,jdbcType=VARCHAR}"); } - -<<<<<<< HEAD if (record.getSpecialId() != null) { sql.SET("special_id = #{record.specialId,jdbcType=VARCHAR}"); } - -======= ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 if (record.getWechatOpenId() != null) { sql.SET("wechat_open_id = #{record.wechatOpenId,jdbcType=VARCHAR}"); } @@ -253,10 +242,7 @@ public class BsUserSqlProvider { sql.SET("phone = #{record.phone,jdbcType=VARCHAR}"); sql.SET("grade = #{record.grade,jdbcType=INTEGER}"); sql.SET("wechat_num = #{record.wechatNum,jdbcType=VARCHAR}"); -<<<<<<< HEAD sql.SET("special_id = #{record.specialId,jdbcType=VARCHAR}"); -======= ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 sql.SET("wechat_open_id = #{record.wechatOpenId,jdbcType=VARCHAR}"); sql.SET("wechat_unionid = #{record.wechatUnionid,jdbcType=VARCHAR}"); sql.SET("elm_pid = #{record.elmPid,jdbcType=VARCHAR}"); @@ -300,13 +286,10 @@ public class BsUserSqlProvider { sql.SET("wechat_num = #{wechatNum,jdbcType=VARCHAR}"); } -<<<<<<< HEAD if (record.getSpecialId() != null) { sql.SET("special_id = #{specialId,jdbcType=VARCHAR}"); } - -======= ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 + if (record.getWechatOpenId() != null) { sql.SET("wechat_open_id = #{wechatOpenId,jdbcType=VARCHAR}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsUser.java b/service/src/main/java/com/hfkj/entity/BsUser.java index 3721e1e..4b28b75 100644 --- a/service/src/main/java/com/hfkj/entity/BsUser.java +++ b/service/src/main/java/com/hfkj/entity/BsUser.java @@ -158,7 +158,6 @@ public class BsUser implements Serializable { this.wechatNum = wechatNum; } -<<<<<<< HEAD public String getSpecialId() { return specialId; } @@ -167,8 +166,6 @@ public class BsUser implements Serializable { this.specialId = specialId; } -======= ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 public String getWechatOpenId() { return wechatOpenId; } @@ -272,8 +269,7 @@ public class BsUser implements Serializable { public void setExt3(String ext3) { this.ext3 = ext3; } -<<<<<<< HEAD -======= + @Override public boolean equals(Object that) { @@ -363,5 +359,5 @@ public class BsUser implements Serializable { sb.append("]"); return sb.toString(); } ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 + } \ No newline at end of file diff --git a/service/src/main/java/com/hfkj/entity/BsUserExample.java b/service/src/main/java/com/hfkj/entity/BsUserExample.java index a63057a..0526f1c 100644 --- a/service/src/main/java/com/hfkj/entity/BsUserExample.java +++ b/service/src/main/java/com/hfkj/entity/BsUserExample.java @@ -526,7 +526,6 @@ public class BsUserExample { return (Criteria) this; } -<<<<<<< HEAD public Criteria andSpecialIdIsNull() { addCriterion("special_id is null"); return (Criteria) this; @@ -597,8 +596,6 @@ public class BsUserExample { return (Criteria) this; } -======= ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 public Criteria andWechatOpenIdIsNull() { addCriterion("wechat_open_id is null"); return (Criteria) this; From d9ab3f6598f08eef80711a24886239d547727629 Mon Sep 17 00:00:00 2001 From: hu177768073 <177768073@qq.com> Date: Wed, 30 Oct 2024 17:09:50 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- bweb/src/main/resources/prod/config.properties | 4 ++-- cweb/src/main/resources/prod/config.properties | 4 ++-- .../src/main/resources/prod/commonConfig.properties | 11 +++++++++++ 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/bweb/src/main/resources/prod/config.properties b/bweb/src/main/resources/prod/config.properties index 44ea8fc..7aea50d 100644 --- a/bweb/src/main/resources/prod/config.properties +++ b/bweb/src/main/resources/prod/config.properties @@ -1,2 +1,2 @@ -fileUrl=/home/project/hsg/filesystem -cmsPath=/home/project/hsg/filesystem/cmsPath +fileUrl=/home/project/youtao/filesystem +cmsPath=/home/project/youtao/filesystem/cmsPath diff --git a/cweb/src/main/resources/prod/config.properties b/cweb/src/main/resources/prod/config.properties index 44ea8fc..7aea50d 100644 --- a/cweb/src/main/resources/prod/config.properties +++ b/cweb/src/main/resources/prod/config.properties @@ -1,2 +1,2 @@ -fileUrl=/home/project/hsg/filesystem -cmsPath=/home/project/hsg/filesystem/cmsPath +fileUrl=/home/project/youtao/filesystem +cmsPath=/home/project/youtao/filesystem/cmsPath diff --git a/service/src/main/resources/prod/commonConfig.properties b/service/src/main/resources/prod/commonConfig.properties index e69de29..b698599 100644 --- a/service/src/main/resources/prod/commonConfig.properties +++ b/service/src/main/resources/prod/commonConfig.properties @@ -0,0 +1,11 @@ +filesystem=/home/project/youtao/filesystem +domain=https://yuanqiyoutao.com + +taoBaoPostUrl = https://eco.taobao.com/router/rest +taoBaoAppKey = 34807616 +taoBaoAppSecret = f04baedca9cd794665dfa04a2fcbfd86 + + +meiTuanPostUrl = https://openapi.meituan.com/api/ +meiTuanAppKey = d876dc3766053f3cde609e5f11a26aba +meiTuanAppSecret = 7cdb8439a4c3fae7a092705bde95d4ef From a26562beca65b3134464e1a97641f035940ebf22 Mon Sep 17 00:00:00 2001 From: yuanye <418471657@qq.com> Date: Thu, 31 Oct 2024 15:15:36 +0800 Subject: [PATCH 3/4] Merge branch 'master' of http://gitea.dctpay.com/hurui/youtao --- .../com/hfkj/controller/GoodsController.java | 24 +--- .../com/hfkj/controller/TestController.java | 120 ----------------- .../hfkj/controller/notify/TaoBaoNotify.java | 6 - .../controller/order/BsOrderController.java | 2 +- .../main/java/com/hfkj/entity/BsOrder.java | 2 +- .../hfkj/service/order/BsOrderService.java | 10 +- .../order/Impl/BsOrderServiceImpl.java | 126 +++++++++++++++++- .../java/com/hfkj/service/pdd/PddService.java | 31 ++++- .../promotion/PromotionBusinessService.java | 2 +- 9 files changed, 159 insertions(+), 164 deletions(-) diff --git a/cweb/src/main/java/com/hfkj/controller/GoodsController.java b/cweb/src/main/java/com/hfkj/controller/GoodsController.java index 4db9f6f..e3f7f93 100644 --- a/cweb/src/main/java/com/hfkj/controller/GoodsController.java +++ b/cweb/src/main/java/com/hfkj/controller/GoodsController.java @@ -68,7 +68,7 @@ public class GoodsController { } else if (type == 2) { // 用户session UserSessionObject userSession = userCenter.getSessionModel(UserSessionObject.class); - Map mapUser = new HashMap<>(); + Map mapUser = new JSONObject(); mapUser.put("uid", userSession.getUser().getId()); JSONObject object = PddService.authority(mapUser.toString()); boolean generateAuthorityUrl = object.getJSONObject("authorityQueryResponse").getInteger("bind") == 0; @@ -124,29 +124,7 @@ public class GoodsController { } } - @RequestMapping(value="/promotion",method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "多多进宝推广链接生成") - public ResponseData promotion(@RequestParam(value = "searchId" , required = false) String searchId, - @RequestParam(value = "goodsSign" , required = false) String goodsSign - ) { - try { - - Map map = new HashMap<>(); - map.put("searchId" , searchId); - map.put("goodsSign" , goodsSign); - JSONObject object = PddService.authority("139"); - boolean generateAuthorityUrl = object.getJSONObject("authorityQueryResponse").getInteger("bind") == 0; - - - JSONObject jsonObject = PddService.promotion(searchId , goodsSign , generateAuthorityUrl , map.toString()); - return ResponseMsgUtil.success(jsonObject.getJSONObject("goodsPromotionUrlGenerateResponse").getJSONArray("goodsPromotionUrlList").getJSONObject(0)); - } catch (Exception e) { - log.error("error!",e); - return ResponseMsgUtil.exception(e); - } - } @RequestMapping(value="/publisher",method = RequestMethod.GET) @ResponseBody diff --git a/cweb/src/main/java/com/hfkj/controller/TestController.java b/cweb/src/main/java/com/hfkj/controller/TestController.java index a5e1ae3..f4277b8 100644 --- a/cweb/src/main/java/com/hfkj/controller/TestController.java +++ b/cweb/src/main/java/com/hfkj/controller/TestController.java @@ -41,12 +41,6 @@ import java.util.Map; public class TestController { private static Logger log = LoggerFactory.getLogger(TestController.class); - @Resource - private BsUserParentRelService userParentRelService; - - @Resource - private BsUserContributeService userContributeService; - @RequestMapping(value="/material",method = RequestMethod.GET) @ResponseBody @ApiOperation(value = "淘宝客-推广者-物料id列表查询 ") @@ -70,120 +64,6 @@ public class TestController { } } - @RequestMapping(value="/createCommand",method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "淘口令生成 ") - public ResponseData createCommand(@RequestParam(value = "url" , required = false) String url - ) { - try { - - JSONObject jsonObject = TaoBaoService.createCommand("https:" + url); - - if (jsonObject.getBoolean("success")) { - return ResponseMsgUtil.success(jsonObject.getJSONObject("data")); - } else { - throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "请求失败！"); - } - - } catch (Exception e) { - log.error("error!",e); - return ResponseMsgUtil.exception(e); - } - } - - @RequestMapping(value="/generateLink",method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "自助取链接口 ") - public ResponseData generateLink(@RequestParam(value = "actId" , required = false) Long actId, - @RequestParam(value = "linkType" , required = false) Integer linkType - ) { - try { - - JSONObject jsonObject = new JSONObject(); - jsonObject.put("actId" , actId); - jsonObject.put("sid" , "001"); - jsonObject.put("linkType" , linkType); - - JSONObject object = MeiTuanService.generateLink(jsonObject); - - return ResponseMsgUtil.success(object); - - } catch (Exception e) { - log.error("error!",e); - return ResponseMsgUtil.exception(e); - } - } - - - @RequestMapping(value="/getParent",method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "getParent ") - public ResponseData getParent() { - try { - - - return ResponseMsgUtil.success(userParentRelService.getParent(Arrays.asList(UserGradeEnum.grade3,UserGradeEnum.grade4), 4L)); - - - } catch (Exception e) { - log.error("error!",e); - return ResponseMsgUtil.exception(e); - } - } - @Resource - private BsUserGradeService userGradeService; - @RequestMapping(value="/promote",method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "promote") - public ResponseData promote() { - try { - userGradeService.promote(1L); - return ResponseMsgUtil.success("操作成功"); - - } catch (Exception e) { - log.error("error!",e); - return ResponseMsgUtil.exception(e); - } - } - - @RequestMapping(value="/purchase",method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "会员贡献测试") - public ResponseData purchase(@RequestParam(value = "rebate" , required = true) BigDecimal rebate, - @RequestParam(value = "userId" , required = true) Long userId) { - try { - - Map otherParam = new HashMap<>(); - otherParam.put("sourceId", System.currentTimeMillis()); - otherParam.put("sourceOrderNo", System.currentTimeMillis()); - userContributeService.purchase(rebate, userId, otherParam); - - - return ResponseMsgUtil.success("操作成功"); - - } catch (Exception e) { - log.error("error!",e); - return ResponseMsgUtil.exception(e); - } - } - - @RequestMapping(value="/authorize",method = RequestMethod.GET) - @ResponseBody - @ApiOperation(value = "获取淘宝code") - public ResponseData authorize() { - try { - - - JSONObject object = HttpsUtils.doGet("https://oauth.taobao.com/authorize?response_type=code&client_id=34807616&redirect_uri=https://yuanqiyoutao.com/crest/taoBaoNotify/notify&state=1212&view=wap"); - - - return ResponseMsgUtil.success(object); - - } catch (Exception e) { - log.error("error!",e); - return ResponseMsgUtil.exception(e); - } - } diff --git a/cweb/src/main/java/com/hfkj/controller/notify/TaoBaoNotify.java b/cweb/src/main/java/com/hfkj/controller/notify/TaoBaoNotify.java index 8dd3d2b..df70243 100644 --- a/cweb/src/main/java/com/hfkj/controller/notify/TaoBaoNotify.java +++ b/cweb/src/main/java/com/hfkj/controller/notify/TaoBaoNotify.java @@ -1,9 +1,6 @@ package com.hfkj.controller.notify; import com.alibaba.fastjson.JSONObject; -import com.hfkj.common.utils.HttpsUtils; -import com.hfkj.config.CommonSysConst; -import com.hfkj.service.taobao.TaoBaoService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.slf4j.Logger; @@ -11,9 +8,6 @@ import org.slf4j.LoggerFactory; import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; -import javax.servlet.http.HttpServletResponse; -import java.io.PrintWriter; - @Controller @RequestMapping(value = "/taoBaoNotify") @Api(value = "淘宝业务通知") diff --git a/cweb/src/main/java/com/hfkj/controller/order/BsOrderController.java b/cweb/src/main/java/com/hfkj/controller/order/BsOrderController.java index 453f382..367de94 100644 --- a/cweb/src/main/java/com/hfkj/controller/order/BsOrderController.java +++ b/cweb/src/main/java/com/hfkj/controller/order/BsOrderController.java @@ -99,7 +99,7 @@ public class BsOrderController { public ResponseData getPddOrderList() { try { - return ResponseMsgUtil.success(orderService.getOrderList()); + return ResponseMsgUtil.success(orderService.getOrderList("2024-10-01 00:00:00")); } catch (Exception e) { log.error("error!",e); diff --git a/service/src/main/java/com/hfkj/entity/BsOrder.java b/service/src/main/java/com/hfkj/entity/BsOrder.java index 992e7e2..5473cdf 100644 --- a/service/src/main/java/com/hfkj/entity/BsOrder.java +++ b/service/src/main/java/com/hfkj/entity/BsOrder.java @@ -75,7 +75,7 @@ public class BsOrder implements Serializable { private BigDecimal gold; /** - * 1-已支付 2-确认收货；3-审核成功；4-审核失败（不可提现）；5-已经结算 ;10-已处罚 + * 状态 0-已支付；1-已成团；2-确认收货；3-审核成功；4-审核失败（不可提现）；5-已经结算 6-已失效 ;10-已处罚 */ private Integer status; diff --git a/service/src/main/java/com/hfkj/service/order/BsOrderService.java b/service/src/main/java/com/hfkj/service/order/BsOrderService.java index 0e9e99a..e49bd0a 100644 --- a/service/src/main/java/com/hfkj/service/order/BsOrderService.java +++ b/service/src/main/java/com/hfkj/service/order/BsOrderService.java @@ -1,6 +1,7 @@ package com.hfkj.service.order; import com.alibaba.fastjson.JSONObject; +import com.hfkj.entity.BsCornucopiaConfig; import com.hfkj.entity.BsOrder; import com.hfkj.model.BsOrderModel; @@ -16,6 +17,8 @@ import java.util.Map; **/ public interface BsOrderService { + void create(BsOrder order); + /** * 编辑数据 * @param order @@ -64,7 +67,7 @@ public interface BsOrderService { * @Author: Sum1Dream * @Date: 2024/10/23 上午10:27 */ - JSONObject getOrderList() throws Exception; + JSONObject getOrderList(String startTime) throws Exception; /** * @MethodName getOrderListParent @@ -79,13 +82,12 @@ public interface BsOrderService { /** * @MethodName orderRebate * @Description: 订单返利 - * @param orderNo 订单号 - * @param gold 返利金额 + * @param bsOrder 订单 * @return: void * @Author: Sum1Dream * @Date: 2024/10/24 下午3:03 */ - void orderRebate(String orderNo , BigDecimal gold) throws Exception; + void orderRebate(BsOrder bsOrder) throws Exception; } diff --git a/service/src/main/java/com/hfkj/service/order/Impl/BsOrderServiceImpl.java b/service/src/main/java/com/hfkj/service/order/Impl/BsOrderServiceImpl.java index 9cdbcc4..252345e 100644 --- a/service/src/main/java/com/hfkj/service/order/Impl/BsOrderServiceImpl.java +++ b/service/src/main/java/com/hfkj/service/order/Impl/BsOrderServiceImpl.java @@ -1,14 +1,18 @@ package com.hfkj.service.order.Impl; +import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.hfkj.common.exception.ErrorCode; import com.hfkj.common.exception.ErrorHelp; import com.hfkj.common.exception.SysCode; +import com.hfkj.common.utils.DateUtil; import com.hfkj.common.utils.OrderUtil; import com.hfkj.common.utils.RedisUtil; import com.hfkj.dao.BsOrderMapper; +import com.hfkj.entity.BsCornucopiaConfig; import com.hfkj.entity.BsOrder; import com.hfkj.entity.BsOrderExample; +import com.hfkj.entity.BsUser; import com.hfkj.model.BsOrderModel; import com.hfkj.model.UserTeamModel; import com.hfkj.service.order.BsOrderService; @@ -18,6 +22,10 @@ import com.hfkj.service.promotion.PromotionBusinessService; import com.hfkj.service.sec.SecDictionaryService; import com.hfkj.service.user.BsUserContributeService; import com.hfkj.service.user.BsUserParentRelService; +import com.hfkj.service.user.BsUserService; +import com.hfkj.sysenum.partner.PartnerEnum; +import com.hfkj.sysenum.user.UserAccountRecordSourceTypeEnum; +import com.pdd.pop.sdk.http.api.pop.response.PddDdkOrderListRangeGetResponse; import org.apache.commons.collections4.MapUtils; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.BeanUtils; @@ -52,6 +60,14 @@ public class BsOrderServiceImpl implements BsOrderService { @Resource private SecDictionaryService secDictionaryService; + @Resource + private BsUserService userService; + + @Override + public void create(BsOrder order) { + bsOrderMapper.insert(order); + } + @Override public BsOrder editData(BsOrder order) { bsOrderMapper.updateByPrimaryKey(order); @@ -129,10 +145,13 @@ public class BsOrderServiceImpl implements BsOrderService { } @Override - public JSONObject getOrderList() throws Exception{ - return PddService.getOrderList(); + public JSONObject getOrderList(String startTime) throws Exception{ + + pddOrder(startTime); + return null; } + @Override public List getOrderListParent(Map map) { @@ -190,9 +209,7 @@ public class BsOrderServiceImpl implements BsOrderService { } @Override - public void orderRebate(String orderNo, BigDecimal gold) throws Exception { - BsOrder bsOrder = findByOrderNo(orderNo); - + public void orderRebate(BsOrder bsOrder) throws Exception { // 判断订单状态是否为4或5 if (bsOrder.getStatus().equals(4) || bsOrder.getStatus().equals(5)) { // 如果是，则抛出异常，提示订单状态不可返利 @@ -202,5 +219,104 @@ public class BsOrderServiceImpl implements BsOrderService { otherParam.put("sourceId", bsOrder.getId()); otherParam.put("sourceOrderNo", bsOrder.getOrderNo()); userContributeService.purchase(bsOrder.getPromotionAmount(), bsOrder.getUserId(), otherParam); + bsOrder.setStatus(8); + bsOrder.setUpdateTime(new Date()); + bsOrder.setFinishTime(new Date()); + editData(bsOrder); + + } + + + + + // 根据开始时间获取拼多多订单列表 + private void pddOrder(String startTime) throws Exception{ + // 调用PddService的getOrderList方法获取订单列表 + PddDdkOrderListRangeGetResponse rangeGetResponse = PddService.getOrderList(startTime); + // 调用getOrderList方法获取本地订单列表 + List list = getOrderList(new HashMap<>()); + // 判断rangeGetResponse是否为空 + if (rangeGetResponse != null) { + // 获取订单列表 + List orderListItems = rangeGetResponse.getOrderListGetResponse().getOrderList(); + // 判断订单列表是否为空 + if (!orderListItems.isEmpty()) { + for (PddDdkOrderListRangeGetResponse.OrderListGetResponseOrderListItem orderListItem : orderListItems) { + // 用户uid + boolean containsEqual = orderListItem.getCustomParameters().contains("="); + String uid; + if (containsEqual) { + // 去掉字符串中的'{' + char charToRemove = '{'; + + String strippedString = StringUtils.strip(orderListItem.getCustomParameters(), String.valueOf(charToRemove)); + // 以'='为分隔符，将字符串分割成数组 + String[] split = strippedString.substring(0, strippedString.length()-1).split("="); + // 获取数组中的第二个元素，即uid + uid = split[1]; + } else { + // 将字符串转换为JSONObject对象 + JSONObject custom = JSON.parseObject(orderListItem.getCustomParameters()); + // 获取JSONObject对象中的uid + uid = custom.getString("uid"); + } + + // 根据订单号获取BsOrder对象 + BsOrder bsOrder = list.stream().filter(s->s.getOrderNo().equals(orderListItem.getOrderSn())).findFirst().orElse(null); + // 根据uid获取BsUser对象 + BsUser user = userService.getUser(uid); + if (bsOrder == null) { + // 如果BsOrder对象为空，则创建新的BsOrder对象 + bsOrder = new BsOrder(); + bsOrder.setOrderNo(orderListItem.getOrderSn()); + bsOrder.setUserId(Long.valueOf(uid)); + bsOrder.setUserPhone(user.getPhone()); + bsOrder.setCreateTime(new Date()); + bsOrder.setUpdateTime(new Date()); + bsOrder.setStatus(orderListItem.getOrderStatus()); + bsOrder.setImg(orderListItem.getGoodsThumbnailUrl()); + bsOrder.setType(2); + bsOrder.setGoodsName(orderListItem.getGoodsName()); + bsOrder.setGoodsCount(Math.toIntExact(orderListItem.getGoodsQuantity())); + bsOrder.setCustomparameters(orderListItem.getCustomParameters()); + bsOrder.setTotalPrice(BigDecimal.valueOf(orderListItem.getOrderAmount())); + bsOrder.setPromotionAmount(BigDecimal.valueOf(orderListItem.getPromotionAmount())); + bsOrder.setPayTime(DateUtil.long2Date(orderListItem.getOrderPayTime())); + bsOrder.setCreateTime(DateUtil.long2Date(orderListItem.getOrderCreateTime())); + bsOrder.setFinishTime(DateUtil.long2Date(orderListItem.getOrderSettleTime())); + bsOrder.setRefundTime(DateUtil.long2Date(orderListItem.getOrderModifyAt())); + bsOrder.setCancelTime(DateUtil.long2Date(orderListItem.getOrderModifyAt())); + create(bsOrder); + }else { + // 如果BsOrder对象不为空，则更新BsOrder对象 + bsOrder.setUpdateTime(new Date()); + bsOrder.setStatus(orderListItem.getOrderStatus()); + bsOrder.setImg(orderListItem.getGoodsThumbnailUrl()); + bsOrder.setType(2); + bsOrder.setGoodsName(orderListItem.getGoodsName()); + bsOrder.setGoodsCount(Math.toIntExact(orderListItem.getGoodsQuantity())); + bsOrder.setCustomparameters(orderListItem.getCustomParameters()); + bsOrder.setTotalPrice(BigDecimal.valueOf(orderListItem.getOrderAmount())); + bsOrder.setPromotionAmount(BigDecimal.valueOf(orderListItem.getPromotionAmount())); + bsOrder.setPayTime(DateUtil.long2Date(orderListItem.getOrderPayTime())); + bsOrder.setCreateTime(DateUtil.long2Date(orderListItem.getOrderCreateTime())); + bsOrder.setFinishTime(DateUtil.long2Date(orderListItem.getOrderSettleTime())); + bsOrder.setRefundTime(DateUtil.long2Date(orderListItem.getOrderModifyAt())); + bsOrder.setCancelTime(DateUtil.long2Date(orderListItem.getOrderModifyAt())); + // 如果订单状态为5，则调用orderRebate方法 + if (bsOrder.getStatus() == 5){ + orderRebate(bsOrder); + } else { + editData(bsOrder); + + } + } + + } + } + } + + } + } diff --git a/service/src/main/java/com/hfkj/service/pdd/PddService.java b/service/src/main/java/com/hfkj/service/pdd/PddService.java index a5c523e..d86f293 100644 --- a/service/src/main/java/com/hfkj/service/pdd/PddService.java +++ b/service/src/main/java/com/hfkj/service/pdd/PddService.java @@ -168,7 +168,7 @@ public class PddService { * @Author: Sum1Dream * @Date: 2024/10/23 上午10:27 */ - public static JSONObject getOrderList() throws Exception { + public static PddDdkOrderListRangeGetResponse getOrderList(String startTime) throws Exception { log.info("============ 拼多多请求-START ============="); String clientId = "71a050c5d93d4169a237539af44c7c33"; @@ -176,12 +176,37 @@ public class PddService { PopClient client = new PopHttpClient(clientId, clientSecret); PddDdkOrderListRangeGetRequest request = new PddDdkOrderListRangeGetRequest(); - request.setCashGiftOrder(true); - request.setStartTime("2024-05-07 00:00:00"); + request.setStartTime(startTime); request.setPageSize(300); + request.setQueryOrderType(1); request.setEndTime(DateUtil.format(new Date(), "yyyy-MM-dd HH:mm:ss")); PddDdkOrderListRangeGetResponse response = client.syncInvoke(request); + log.info("请求接口：" + "authority"); + log.info("请求参数：" + JSONObject.toJSONString(request)); + log.info("响应参数：" + JsonUtil.transferToJson(response)); + log.info("============ 拼多多请求-END =============="); + return response; + + } + + public static JSONObject increment() throws Exception { + + log.info("============ 拼多多请求-START ============="); + String clientId = "71a050c5d93d4169a237539af44c7c33"; + String clientSecret = "b96def667dd28660d09f19ba2e9e9f23d810d563"; + PopClient client = new PopHttpClient(clientId, clientSecret); + + PddDdkOrderListIncrementGetRequest request = new PddDdkOrderListIncrementGetRequest(); + request.setCashGiftOrder(true); + request.setEndUpdateTime(24L); + request.setPage(1); + request.setPageSize(50); + request.setQueryOrderType(1); + request.setReturnCount(true); + request.setStartUpdateTime(new Date().getTime()); + PddDdkOrderListIncrementGetResponse response = client.syncInvoke(request); + log.info("请求接口：" + "authority"); log.info("请求参数：" + JSONObject.toJSONString(request)); log.info("响应参数：" + JsonUtil.transferToJson(response)); diff --git a/service/src/main/java/com/hfkj/service/promotion/PromotionBusinessService.java b/service/src/main/java/com/hfkj/service/promotion/PromotionBusinessService.java index c4ff9ac..40d88cd 100644 --- a/service/src/main/java/com/hfkj/service/promotion/PromotionBusinessService.java +++ b/service/src/main/java/com/hfkj/service/promotion/PromotionBusinessService.java @@ -48,7 +48,7 @@ public class PromotionBusinessService { throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "缺少goodsSign！"); } - Map mapUser = new HashMap<>(); + Map mapUser = new JSONObject(); mapUser.put("uid", jsonObject.getLong("userId")); // 判断是否需要授权 From 22780abe389644328fdf3cc9de9ca195d3c48d39 Mon Sep 17 00:00:00 2001 From: hu177768073 <177768073@qq.com> Date: Thu, 31 Oct 2024 15:16:02 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/hfkj/dao/BsUserMapper.java | 19 +------------------ .../java/com/hfkj/dao/BsUserSqlProvider.java | 4 +++- .../src/main/java/com/hfkj/entity/BsUser.java | 8 +++----- 3 files changed, 7 insertions(+), 24 deletions(-) diff --git a/service/src/main/java/com/hfkj/dao/BsUserMapper.java b/service/src/main/java/com/hfkj/dao/BsUserMapper.java index b82a0f9..3dd804f 100644 --- a/service/src/main/java/com/hfkj/dao/BsUserMapper.java +++ b/service/src/main/java/com/hfkj/dao/BsUserMapper.java @@ -56,21 +56,7 @@ public interface BsUserMapper extends BsUserMapperExt { "#{partnerLevel,jdbcType=INTEGER}, #{partnerIncomePer,jdbcType=DECIMAL}, ", "#{status,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, ", "#{updateTime,jdbcType=TIMESTAMP}, #{ext1,jdbcType=VARCHAR}, ", - "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})", - "wechat_open_id, wechat_unionid, ", - "elm_pid, invite_user_id, ", - "invite_time, partner_level, ", - "partner_income_per, `status`, ", - "create_time, update_time, ", - "ext_1, ext_2, ext_3)", - "values (#{headImg,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, ", - "#{phone,jdbcType=VARCHAR}, #{grade,jdbcType=INTEGER}, #{wechatNum,jdbcType=VARCHAR}, ", - "#{wechatOpenId,jdbcType=VARCHAR}, #{wechatUnionid,jdbcType=VARCHAR}, ", - "#{elmPid,jdbcType=VARCHAR}, #{inviteUserId,jdbcType=BIGINT}, ", - "#{inviteTime,jdbcType=TIMESTAMP}, #{partnerLevel,jdbcType=INTEGER}, ", - "#{partnerIncomePer,jdbcType=DECIMAL}, #{status,jdbcType=INTEGER}, ", - "#{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, ", - "#{ext1,jdbcType=VARCHAR}, #{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" + "#{ext2,jdbcType=VARCHAR}, #{ext3,jdbcType=VARCHAR})" }) @Options(useGeneratedKeys=true,keyProperty="id") int insert(BsUser record); @@ -109,9 +95,6 @@ public interface BsUserMapper extends BsUserMapperExt { "id, head_img, `name`, phone, grade, wechat_num, special_id, wechat_open_id, ", "wechat_unionid, elm_pid, invite_user_id, invite_time, partner_level, partner_income_per, ", "`status`, create_time, update_time, ext_1, ext_2, ext_3", - "id, head_img, `name`, phone, grade, wechat_num, wechat_open_id, wechat_unionid, ", - "elm_pid, invite_user_id, invite_time, partner_level, partner_income_per, `status`, ", - "create_time, update_time, ext_1, ext_2, ext_3", "from bs_user", "where id = #{id,jdbcType=BIGINT}" }) diff --git a/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java b/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java index aa32fd1..5150a17 100644 --- a/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java +++ b/service/src/main/java/com/hfkj/dao/BsUserSqlProvider.java @@ -173,9 +173,11 @@ public class BsUserSqlProvider { if (record.getWechatNum() != null) { sql.SET("wechat_num = #{record.wechatNum,jdbcType=VARCHAR}"); } + if (record.getSpecialId() != null) { sql.SET("special_id = #{record.specialId,jdbcType=VARCHAR}"); } + if (record.getWechatOpenId() != null) { sql.SET("wechat_open_id = #{record.wechatOpenId,jdbcType=VARCHAR}"); } @@ -289,7 +291,7 @@ public class BsUserSqlProvider { if (record.getSpecialId() != null) { sql.SET("special_id = #{specialId,jdbcType=VARCHAR}"); } - + if (record.getWechatOpenId() != null) { sql.SET("wechat_open_id = #{wechatOpenId,jdbcType=VARCHAR}"); } diff --git a/service/src/main/java/com/hfkj/entity/BsUser.java b/service/src/main/java/com/hfkj/entity/BsUser.java index 4b28b75..9e538a2 100644 --- a/service/src/main/java/com/hfkj/entity/BsUser.java +++ b/service/src/main/java/com/hfkj/entity/BsUser.java @@ -45,14 +45,11 @@ public class BsUser implements Serializable { private String wechatNum; /** -<<<<<<< HEAD * 淘宝会员独有 */ private String specialId; /** -======= ->>>>>>> 9fd569d446b9f1a74c4b28147a3572ee8a076825 * 微信openid */ private String wechatOpenId; @@ -270,7 +267,6 @@ public class BsUser implements Serializable { this.ext3 = ext3; } - @Override public boolean equals(Object that) { if (this == that) { @@ -289,6 +285,7 @@ public class BsUser implements Serializable { && (this.getPhone() == null ? other.getPhone() == null : this.getPhone().equals(other.getPhone())) && (this.getGrade() == null ? other.getGrade() == null : this.getGrade().equals(other.getGrade())) && (this.getWechatNum() == null ? other.getWechatNum() == null : this.getWechatNum().equals(other.getWechatNum())) + && (this.getSpecialId() == null ? other.getSpecialId() == null : this.getSpecialId().equals(other.getSpecialId())) && (this.getWechatOpenId() == null ? other.getWechatOpenId() == null : this.getWechatOpenId().equals(other.getWechatOpenId())) && (this.getWechatUnionid() == null ? other.getWechatUnionid() == null : this.getWechatUnionid().equals(other.getWechatUnionid())) && (this.getElmPid() == null ? other.getElmPid() == null : this.getElmPid().equals(other.getElmPid())) @@ -314,6 +311,7 @@ public class BsUser implements Serializable { result = prime * result + ((getPhone() == null) ? 0 : getPhone().hashCode()); result = prime * result + ((getGrade() == null) ? 0 : getGrade().hashCode()); result = prime * result + ((getWechatNum() == null) ? 0 : getWechatNum().hashCode()); + result = prime * result + ((getSpecialId() == null) ? 0 : getSpecialId().hashCode()); result = prime * result + ((getWechatOpenId() == null) ? 0 : getWechatOpenId().hashCode()); result = prime * result + ((getWechatUnionid() == null) ? 0 : getWechatUnionid().hashCode()); result = prime * result + ((getElmPid() == null) ? 0 : getElmPid().hashCode()); @@ -342,6 +340,7 @@ public class BsUser implements Serializable { sb.append(", phone=").append(phone); sb.append(", grade=").append(grade); sb.append(", wechatNum=").append(wechatNum); + sb.append(", specialId=").append(specialId); sb.append(", wechatOpenId=").append(wechatOpenId); sb.append(", wechatUnionid=").append(wechatUnionid); sb.append(", elmPid=").append(elmPid); @@ -359,5 +358,4 @@ public class BsUser implements Serializable { sb.append("]"); return sb.toString(); } - } \ No newline at end of file