xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 10:16:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'sit-Leung' into sit-jiamin-v2

Browse Source
This commit is contained in:
952108534@qq.com 2022-01-26 19:32:16 +08:00
commit b796a256df
10 changed files with 44 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rc-busness/app.html
View File

@ -5,5 +5,14 @@
</head> </head>
<body {{ BODY_ATTRS }}> <body {{ BODY_ATTRS }}>
{{ APP }} {{ APP }}
<script>
var _hmt = _hmt || [];
(function() {
var hm = document.createElement("script");
hm.src = "https://hm.baidu.com/hm.js?17dd7dc6178678861e478d02b7a8182e";
var s = document.getElementsByTagName("script")[0];
s.parentNode.insertBefore(hm, s);
})();
</script>
</body> </body>
</html> </html>

3
rc-busness/pages/productdetails/productlist.vue
View File

@ -105,7 +105,8 @@
@click="selectproduce(item)" @click="selectproduce(item)"
> >
<div class="rc-rccontair"> <div class="rc-rccontair">
<img :src="item.picture" alt="" /> <img :src="item.picture" v-if="(item.picture && item.picture.length>0)" alt="" />
<img src="/images/default.jpg" v-if="(!item.picture || item.picture.length<=0)" alt="" />
</div> </div>
</div> </div>
<div class="rc-column"> <div class="rc-column">

3
rc-busness/pages/usersearch/search.vue
View File

@ -113,7 +113,8 @@
@click="selectproduce(item)" @click="selectproduce(item)"
> >
<div class="rc-rccontair"> <div class="rc-rccontair">
<img :src="item.picture" alt="" /> <img :src="item.picture" v-if="(item.picture && item.picture.length>0)" alt="" />
<img src="/images/default.jpg" v-if="(!item.picture || item.picture.length<=0)" alt="" />
</div> </div>
</div> </div>
<div class="rc-column"> <div class="rc-column">

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/MemberService.java
View File

@ -21,7 +21,7 @@ public class MemberService {
public String memberGet(MemberGetEntity memberGetEntity, HttpServletRequest request)throws Exception { public String memberGet(MemberGetEntity memberGetEntity)throws Exception {
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberGetEntity); Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberGetEntity);
paramMap.put("id",StringUtil.toString(memberGetEntity.getId()).equals("0")?null:StringUtil.toString(memberGetEntity.getId())); paramMap.put("id",StringUtil.toString(memberGetEntity.getId()).equals("0")?null:StringUtil.toString(memberGetEntity.getId()));
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);

24
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/TransitionController.java
View File

@ -6,6 +6,7 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import net.lab1024.smartadmin.common.anno.OperateLog; 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.domain.ResponseDTO;
import net.lab1024.smartadmin.common.heartbeat.StringUtil; import net.lab1024.smartadmin.common.heartbeat.StringUtil;
import net.lab1024.smartadmin.constant.SwaggerTagConst; 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.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
@ -78,7 +80,7 @@ public class TransitionController {
switch (type) switch (type)
{ {
case "get": case "get":
result = memberService.memberGet(objectMapper.convertValue(object,MemberGetEntity.class),request); result = memberService.memberGet(objectMapper.convertValue(object,MemberGetEntity.class));
break; break;
case "check": case "check":
result = memberService.memberCheck(objectMapper.convertValue(object,MemberCheckEntity.class)); result = memberService.memberCheck(objectMapper.convertValue(object,MemberCheckEntity.class));
@ -101,6 +103,26 @@ public class TransitionController {
return result; return result;
} }
@ApiOperation(value = "登录或注册", notes = "会员查询，登录注册")
@PostMapping("royalcanin/regOrLogin")
public ResponseDTO<String> 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 = "查询会员地址，添加会员地址，更新会员地址,删除会员地址") @ApiOperation(value = "会员地址", notes = "查询会员地址，添加会员地址，更新会员地址,删除会员地址")
@PostMapping("royalcanin/memberAddress") @PostMapping("royalcanin/memberAddress")
public String transferMemberAddress(String type ,@RequestBody Object object, HttpServletRequest request) throws Exception { public String transferMemberAddress(String type ,@RequestBody Object object, HttpServletRequest request) throws Exception {

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/model/GoodsEntity.java
View File

@ -34,4 +34,6 @@ public class GoodsEntity {
private int isSales; private int isSales;
private int isShow; private int isShow;
private String goodUrl;
} }

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/royalcanin/good/service/GoodService.java
View File

@ -53,9 +53,11 @@ public class GoodService {
paramMap.remove("tagFunction"); paramMap.remove("tagFunction");
paramMap.remove("tagBreed"); paramMap.remove("tagBreed");
paramMap.remove("tagStatus"); paramMap.remove("tagStatus");
paramMap.put("count",StringUtil.toString(productQueryEntity.getCount()).equals("0")?null:productQueryEntity.getCount());
MapRemoveNullUtil.removeNullEntry(paramMap); MapRemoveNullUtil.removeNullEntry(paramMap);
paramMap.put("secret","H5@2021"); paramMap.put("secret","H5@2021");
paramMap.put("channelId","15"); paramMap.put("channelId","15");
paramMap.put("isSales","1");
String sb = SmartHttpUtil.sendPostForm(url+"product/query",paramMap,null); String sb = SmartHttpUtil.sendPostForm(url+"product/query",paramMap,null);
JSONObject jsonObject = JSONObject.parseObject(sb); JSONObject jsonObject = JSONObject.parseObject(sb);
String result = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY); String result = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY);

2
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/util/SmsUtil.java
View File

@ -14,7 +14,7 @@ public class SmsUtil {
SMSServiceSoap_BindingStub stub = (SMSServiceSoap_BindingStub) service.getSMSServiceSoap(protAddres); SMSServiceSoap_BindingStub stub = (SMSServiceSoap_BindingStub) service.getSMSServiceSoap(protAddres);
java.util.Calendar cal= java.util.Calendar.getInstance(); java.util.Calendar cal= java.util.Calendar.getInstance();
cal.set(2021,12,31,0,0,0); 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:")) if (sMSGID.startsWith("OK:"))
System.out.println("Send successful!"); System.out.println("Send successful!");
System.out.println("msgId = " + sMSGID); System.out.println("msgId = " + sMSGID);

1
smart-admin-service/smart-admin-api/src/main/resources/mapper/system/royalcanin/good/GoodMapper.xml
View File

@ -19,6 +19,7 @@
tagUsedAge, tagUsedAge,
category_name, category_name,
picture, picture,
good_url,
show_img_file show_img_file
from t_good_goods from t_good_goods
where isShow = 1 where isShow = 1

1
smart-admin-service/smart-admin-api/src/main/resources/sql/smart-admin.sql
View File

@ -1640,6 +1640,7 @@ CREATE TABLE `t_good_goods` (
`tagUsedAge` varchar(11) DEFAULT NULL COMMENT '适用阶段', `tagUsedAge` varchar(11) DEFAULT NULL COMMENT '适用阶段',
`picture` varchar(200) DEFAULT NULL COMMENT '标品头图', `picture` varchar(200) DEFAULT NULL COMMENT '标品头图',
`show_img_file` 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：销售', `isSales` int(11) DEFAULT NULL COMMENT '0:未销售，1：销售',
`isShow` int(11) DEFAULT NULL COMMENT '0:不展示，1：展示', `isShow` int(11) DEFAULT NULL COMMENT '0:不展示，1：展示',
PRIMARY KEY (`id`) PRIMARY KEY (`id`)