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

debugger

Browse Source
This commit is contained in:
Carl 2022-01-30 15:52:41 +08:00
parent 3deeab7bc2
commit 3ca9cbe111
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -131,7 +131,6 @@ public class OrderController {
Map<String, String> returnMap = new HashMap<>();
returnMap.put("orderNumber", ordersEntity.getOrderNo());
returnMap.put("orderAmount", ordersEntity.getOrderAmount());
// return ResponseDTO.succData(returnMap,wxpayService.generateQRCode(wxPayEntity));
return ResponseDTO.succData(returnMap, wxpayService.generateQRCode(wxPayEntity));
}
}catch (Exception e){

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

@ -31,7 +31,11 @@ public class GoodService {
private RedisTemplate redisTemplate;
public GoodsEntity listGoodsByProductCode(String productCode){
return goodsDao.findByProductCode(productCode);
String ip = "https://shop.royalcanin.com.cn/royalcanin/royalcanin/";
GoodsEntity goodsEntity = goodsDao.findByProductCode(productCode);
goodsEntity.setShowImgFile(ip+goodsEntity.getPicture());
goodsEntity.setPicture(ip+goodsEntity.getPicture());
return goodsEntity;
}
public List<GoodsEntity> listGoodsByNameBankNameTagUsedAge(String title,String petType){

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

@ -238,14 +238,19 @@ public class OrderService {
JSONObject jsonObject = JSONObject.parseObject(result);
String afterDecodeResult = AESUtil.decryptLinux(jsonObject.getString("data"), AESUtil.KEY);
com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(afterDecodeResult);
JSONObject jsonObjectResult = (JSONObject)jsonArray.get(0);
if (queryEntity.getOrderNumber() != null &&queryEntity.getOrderNumber() != "") {
OrderEntity orderEntity = ordersDao.findByOrderId(queryEntity.getOrderNumber());
//新增支付方式paytype
jsonObjectResult.put("paytype",orderEntity.getPayType());
jsonObjectResult.put("basePoint",orderEntity.getBasePoint());
}
for (int i = 0; i < jsonArray.size();i++){
JSONObject jsonObjectResult = (JSONObject)jsonArray.get(i);
OrderEntity orderEntity = ordersDao.findByOrderId(jsonObjectResult.getString("orderNumber"));
if (orderEntity == null){
jsonObjectResult.put("paytype","0");
jsonObjectResult.put("basePoint","0");
}else {
//新增支付方式paytype
jsonObjectResult.put("paytype",orderEntity.getPayType());
jsonObjectResult.put("basePoint",orderEntity.getBasePoint());
}
}
//记录服务响应时间
addOperatreFullData(url+"orderMaster/query",queryEntity.toString(),result, startTime,elapsedTime,acceptTime);

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

@ -46,8 +46,8 @@ public class WxpayService {
@Autowired
private MemberAccountService memberAccountService;
String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/";
// String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020";
// String url = "https://miniapp-test.royalcanin.com.cn/rcmini/h5/";
String url = "https://miniapp-product.royalcanin.com.cn/rcmini2020/h5/";
public String generateQRCode(WxPayEntity wxPayEntity) throws Exception {
WXPay wxpay = new WXPay(config);