From 78671d35b6f2c5f9ea219adaf8df425ee7368f4a Mon Sep 17 00:00:00 2001 From: Vion Date: Tue, 25 Jan 2022 12:46:59 +0800 Subject: [PATCH 1/5] Default images added in product list / search --- rc-busness/pages/productdetails/productlist.vue | 3 ++- rc-busness/pages/usersearch/search.vue | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/rc-busness/pages/productdetails/productlist.vue b/rc-busness/pages/productdetails/productlist.vue index a2bad863..d11951f8 100644 --- a/rc-busness/pages/productdetails/productlist.vue +++ b/rc-busness/pages/productdetails/productlist.vue @@ -105,7 +105,8 @@ @click="selectproduce(item)" >
- + +
diff --git a/rc-busness/pages/usersearch/search.vue b/rc-busness/pages/usersearch/search.vue index ea1dac4e..e79cf7dc 100644 --- a/rc-busness/pages/usersearch/search.vue +++ b/rc-busness/pages/usersearch/search.vue @@ -113,7 +113,8 @@ @click="selectproduce(item)" >
- + +
From b7b9f99fafbd50b8e3276bca0c38f096e878618e Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 25 Jan 2022 16:41:29 +0800 Subject: [PATCH 2/5] add reg or login logic . --- .../system/royalcanin/MemberService.java | 2 +- .../royalcanin/TransitionController.java | 24 ++++++++++++++++++- .../royalcanin/good/model/GoodsEntity.java | 2 ++ .../system/royalcanin/good/GoodMapper.xml | 1 + .../src/main/resources/sql/smart-admin.sql | 1 + 5 files changed, 28 insertions(+), 2 deletions(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java index 1b7f4ba3..ab979278 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java @@ -21,7 +21,7 @@ public class MemberService { - public String memberGet(MemberGetEntity memberGetEntity, HttpServletRequest request)throws Exception { + public String memberGet(MemberGetEntity memberGetEntity)throws Exception { Map paramMap = MapRemoveNullUtil.setConditionMap(memberGetEntity); paramMap.put("id",StringUtil.toString(memberGetEntity.getId()).equals("0")?null:StringUtil.toString(memberGetEntity.getId())); MapRemoveNullUtil.removeNullEntry(paramMap); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java index 7b9f1f26..f5cce5f7 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java @@ -6,6 +6,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.log4j.Log4j2; import net.lab1024.smartadmin.common.anno.OperateLog; +import net.lab1024.smartadmin.common.constant.ResponseCodeConst; import net.lab1024.smartadmin.common.domain.ResponseDTO; import net.lab1024.smartadmin.common.heartbeat.StringUtil; import net.lab1024.smartadmin.constant.SwaggerTagConst; @@ -32,6 +33,7 @@ import net.lab1024.smartadmin.util.SmartHttpUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import javax.servlet.http.HttpServletRequest; @@ -78,7 +80,7 @@ public class TransitionController { switch (type) { case "get": - result = memberService.memberGet(objectMapper.convertValue(object,MemberGetEntity.class),request); + result = memberService.memberGet(objectMapper.convertValue(object,MemberGetEntity.class)); break; case "check": result = memberService.memberCheck(objectMapper.convertValue(object,MemberCheckEntity.class)); @@ -101,6 +103,26 @@ public class TransitionController { return result; } + @ApiOperation(value = "登录或注册", notes = "会员查询，登录注册") + @PostMapping("royalcanin/regOrLogin") + public ResponseDTO regOrLogin(@RequestParam String phoneNumber) throws Exception { + MemberCheckEntity memberCheckEntity = new MemberCheckEntity(); + memberCheckEntity.setMobile(phoneNumber); + JSONObject jsonObject = JSONObject.parseObject(memberService.memberCheck(memberCheckEntity)); + if(jsonObject.getString("code").equals("103")){ + MemberGetEntity memberGetEntity = new MemberGetEntity (); + memberGetEntity.setMobile(phoneNumber); + return ResponseDTO.succData(memberService.memberGet(memberGetEntity),"1"); + }else if(jsonObject.getString("code").equals("0")){ + MemberAddEntity memberAddEntity = new MemberAddEntity(); + memberAddEntity.setMobile(phoneNumber); + return ResponseDTO.succData(memberService.memberAdd(memberAddEntity),"2"); + }else{ + return ResponseDTO.wrap(ResponseCodeConst.ERROR_PARAM); + } + } + + @ApiOperation(value = "会员地址", notes = "查询会员地址，添加会员地址，更新会员地址,删除会员地址") @PostMapping("royalcanin/memberAddress") public String transferMemberAddress(String type ,@RequestBody Object object, HttpServletRequest request) throws Exception { diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/GoodsEntity.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/GoodsEntity.java index 61bf17fe..b55984ab 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/GoodsEntity.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/GoodsEntity.java @@ -34,4 +34,6 @@ public class GoodsEntity { private int isSales; private int isShow; + + private String goodUrl; } diff --git a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/good/GoodMapper.xml b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/good/GoodMapper.xml index 66499bc9..a80fe625 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/good/GoodMapper.xml +++ b/smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/good/GoodMapper.xml @@ -19,6 +19,7 @@ tagUsedAge, category_name, picture, + good_url, show_img_file from t_good_goods where isShow = 1 diff --git a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql index 492fcd11..8596a19d 100644 --- a/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql +++ b/smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql @@ -1640,6 +1640,7 @@ CREATE TABLE `t_good_goods` ( `tagUsedAge` varchar(11) DEFAULT NULL COMMENT '适用阶段', `picture` varchar(200) DEFAULT NULL COMMENT '标品头图', `show_img_file` varchar(200) DEFAULT NULL COMMENT '身体头图', +`good_url` varchar(500) DEFAULT NULL COMMENT '处方粮跳转连接', `isSales` int(11) DEFAULT NULL COMMENT '0:未销售，1：销售', `isShow` int(11) DEFAULT NULL COMMENT '0:不展示，1：展示', PRIMARY KEY (`id`) From 0e47b968e3ab193d4a4891c996c2fe8df020516c Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 25 Jan 2022 18:26:18 +0800 Subject: [PATCH 3/5] add sale value 1 --- .../module/system/royalcanin/good/service/GoodService.java | 1 + .../src/main/java/net/lab1024/smartadmin/util/SmsUtil.java | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index c97a77f5..08b84252 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java @@ -56,6 +56,7 @@ public class GoodService { MapRemoveNullUtil.removeNullEntry(paramMap); paramMap.put("secret","H5@2021"); paramMap.put("channelId","15"); + paramMap.put("isSales","1"); String sb = SmartHttpUtil.sendPostForm(url+"product/query",paramMap,null); JSONObject jsonObject = JSONObject.parseObject(sb); String result = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY); diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmsUtil.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmsUtil.java index 2bd4e559..d67b197a 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmsUtil.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmsUtil.java @@ -14,7 +14,7 @@ public class SmsUtil { SMSServiceSoap_BindingStub stub = (SMSServiceSoap_BindingStub) service.getSMSServiceSoap(protAddres); java.util.Calendar cal= java.util.Calendar.getInstance(); cal.set(2021,12,31,0,0,0); - String sMSGID = stub.sendSMS(number,8,"您好，您的验证码：" + verifyNumber + ", 5分钟有效期 ！【皇家宠物食品】",cal,"7101567100151709"); + String sMSGID = stub.sendSMS(number,8,"您好，您的验证码：" + verifyNumber + ", 5分钟有效期 ！",cal,"7101567100151709"); if (sMSGID.startsWith("OK:")) System.out.println("Send successful!"); System.out.println("msgId = " + sMSGID); From b405adfaa8c58b16eb255ff9e2c58e94aded437c Mon Sep 17 00:00:00 2001 From: Carl <376654749@qq.com> Date: Tue, 25 Jan 2022 18:37:40 +0800 Subject: [PATCH 4/5] add sale value 1 --- .../module/system/royalcanin/good/service/GoodService.java | 1 + 1 file changed, 1 insertion(+) diff --git a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java index 08b84252..02119fc5 100644 --- a/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java +++ b/smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java @@ -53,6 +53,7 @@ public class GoodService { paramMap.remove("tagFunction"); paramMap.remove("tagBreed"); paramMap.remove("tagStatus"); + paramMap.put("count",StringUtil.toString(productQueryEntity.getCount()).equals("0")?null:productQueryEntity.getCount()); MapRemoveNullUtil.removeNullEntry(paramMap); paramMap.put("secret","H5@2021"); paramMap.put("channelId","15"); From 0e87e84f9ebc51ea59d18f9614d1302233050ab0 Mon Sep 17 00:00:00 2001 From: Vion Date: Wed, 26 Jan 2022 12:11:44 +0800 Subject: [PATCH 5/5] Baidu tracking code initialized --- rc-busness/app.html | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/rc-busness/app.html b/rc-busness/app.html index cf5975e7..afb50e74 100644 --- a/rc-busness/app.html +++ b/rc-busness/app.html @@ -5,5 +5,14 @@ {{ APP }} + \ No newline at end of file