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

!112 2022-1-26 Carl

Browse Source 
Merge pull request !112 from Admin/sit-Carl-V3
This commit is contained in:
Admin 2022-01-26 09:14:37 +00:00 committed by Gitee
commit 81f9b9b18f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 42 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
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 JSONObject memberGet(MemberGetEntity memberGetEntity)throws Exception {
public String memberGet(MemberGetEntity memberGetEntity)throws Exception {
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberGetEntity);
paramMap.put("id",StringUtil.toString(memberGetEntity.getId()).equals("0")?null:StringUtil.toString(memberGetEntity.getId()));
MapRemoveNullUtil.removeNullEntry(paramMap);
@ -31,9 +31,10 @@ public class MemberService {
JSONObject json = JSONObject.parseObject(jsonObject.getString("data"));
String id = json.getString("id");
jsonObject.put("xaccessToken", SmartJWTUtil.generateToken(id));
return jsonObject;
jsonObject.put(" type","1");
return jsonObject.toJSONString();
}else {
return jsonObject;
return jsonObject.toJSONString();
}
}
public String memberCheck(MemberCheckEntity memberCheckEntity)throws Exception {
@ -42,7 +43,7 @@ public class MemberService {
return SmartHttpUtil.sendPostForm(url+"check",paramMap,null);
}
public JSONObject memberAdd(MemberAddEntity memberAddEntity){
public String memberAdd(MemberAddEntity memberAddEntity){
Map<String, String> paramMap = MapRemoveNullUtil.setConditionMap(memberAddEntity);
paramMap.put("cityId",StringUtil.toString(memberAddEntity.getCityId()).equals("0")?null:StringUtil.toString(memberAddEntity.getCityId()));
paramMap.put("gender",StringUtil.toString(memberAddEntity.getGender()).equals("0")?null:StringUtil.toString(memberAddEntity.getGender()));
@ -56,9 +57,10 @@ public class MemberService {
JSONObject json = JSONObject.parseObject(jsonObjectResult.getString("data"));
String id = json.getString("id");
jsonObjectResult.put("xaccessToken", SmartJWTUtil.generateToken(id));
return jsonObjectResult;
jsonObject.put(" type","2");
return jsonObjectResult.toJSONString();
}else {
return jsonObjectResult;
return jsonObjectResult.toJSONString();
}
}

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

@ -99,20 +99,20 @@ public class TransitionController {
@ApiOperation(value = "登录或注册", notes = "会员查询，登录注册")
@PostMapping("royalcanin/regOrLogin")
public ResponseDTO regOrLogin(@RequestParam String phoneNumber) throws Exception {
public 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");
return memberService.memberGet(memberGetEntity);
}else if(jsonObject.getString("code").equals("0")){
MemberAddEntity memberAddEntity = new MemberAddEntity();
memberAddEntity.setMobile(phoneNumber);
return ResponseDTO.succData(memberService.memberAdd(memberAddEntity),"2");
return memberService.memberAdd(memberAddEntity);
}else{
return ResponseDTO.wrap(ResponseCodeConst.ERROR_PARAM);
return null;
}
}

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

@ -207,12 +207,12 @@ public class OrderController {
Map<String, String> returnMap = new HashMap<>();
returnMap.put("orderNumber",ordersEntity.getOrderNo());
returnMap.put("orderAmount",ordersEntity.getOrderAmount());
return ResponseDTO.succData(wxpayService.dounifiedOrder(wxPayEntity));
return ResponseDTO.succData(returnMap,wxpayService.dounifiedOrder(wxPayEntity));
}
return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_FAIL);
}
@ApiOperation(value = "重新支付", notes = "重新支付")
@ApiOperation(value = "重新支付（二维码）", notes = "重新支付（二维码）")
@PostMapping("royalcanin/repayOrderWX")
public ResponseDTO<String> repayOrderWX(String orderNo) throws Exception {
OrderEntity ordersEntity = orderService.findByOrderId(orderNo);
@ -236,6 +236,30 @@ public class OrderController {
}
}
@ApiOperation(value = "重新支付（H5）", notes = "重新支付（H5）")
@PostMapping("royalcanin/repayOrderWXH5")
public ResponseDTO<String> repayOrderWXH5(String orderNo) throws Exception {
OrderEntity ordersEntity = orderService.findByOrderId(orderNo);
if(ordersEntity != null){
QueryEntity queryEntity = new QueryEntity();
queryEntity.setOrderNumber(ordersEntity.getOrderNo());
String orderInfo = orderService.query(queryEntity);
com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(orderInfo);
JSONObject jsonObject = (JSONObject)jsonArray.get(0);
if(jsonObject.getString("status").equals("0")) {
WxPayEntity wxPayEntity = new WxPayEntity();
wxPayEntity.setProduct_id(ordersEntity.getProductCode());
wxPayEntity.setTotal_fee(jsonObject.getString("salesAmount"));
wxPayEntity.setOut_trade_no(ordersEntity.getOrderNo());
return ResponseDTO.succData(orderInfo,wxpayService.dounifiedOrder(wxPayEntity) );
}else {
return ResponseDTO.wrap(OrderResponseCodeConst.GENERATE_ORDER_ERROR,orderInfo);
}
}else {
return ResponseDTO.wrap(OrderResponseCodeConst.WITHOUT_ORDER);
}
}

8
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java
View File

@ -68,7 +68,7 @@ public class WxpayService {
try {
Map<String, String> resp = wxpay.unifiedOrder(data);
if (resp != null) {
return resp.get("code_url");
return resp.get("code_url") == null ?resp.get("err_code_des"):resp.get("code_url");
}
} catch (Exception e) {
e.printStackTrace();
@ -168,7 +168,7 @@ public class WxpayService {
* @return
* @throws Exception
*/
public Map<String, String> dounifiedOrder(WxPayEntity wxPayEntity) throws Exception {
public String dounifiedOrder(WxPayEntity wxPayEntity) throws Exception {
//返回参数
Map<String, String> returnMap = new HashMap<>();
WXPay wxpay = new WXPay(config);
@ -199,13 +199,13 @@ public class WxpayService {
} else {
returnMap.put("ok", "201");
returnMap.put("url",null);
return returnMap;
return returnMap.get("url") == null ? returnMap.get("err_code_des"):returnMap.get("url");
}
} catch (Exception e) {
System.out.println(e);
//系统等其他错误的时候
}
return returnMap;
return returnMap.get("url");
}