czg_team
/
chaozhanggui
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

This commit is contained in:
hankaikai 2023-06-05 14:28:43 +08:00
parent ecbdd3f0b1 fffecb1535
commit 6102029af0
14 changed files with 55 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pluss-api-page/src/main/java/cn/pluss/platform/controller/BannerController.java
View File

@ -49,6 +49,21 @@ public class BannerController {
List<Banner> banners = bannerService.queryBannerList(queryBanner);
return ResultGenerator.genSuccessResult(banners);
}
@PostMapping("/queryCarousel")
@ApiOperation(tags = {"页面-首页"}, value = "查询所有的轮播图", notes = "查询所有的轮播图", httpMethod = "POST")
public Result<List<Banner>> queryCarousel(@RequestBody Banner banner) {
if (banner == null) {
return ResultGenerator.genFailResult("参数错误！");
}
if (banner.getType() == null || StringUtil.isEmpty(banner.getType())) {
return ResultGenerator.genFailResult("查询参数错误！");
}
Banner queryBanner = new Banner();
queryBanner.setType(banner.getType());
List<Banner> banners = bannerService.queryBannerList(queryBanner);
return ResultGenerator.genSuccessResult(banners);
}
@DeleteMapping("/{id}")
@ApiOperation(value = "删除数据", notes = "根据id删除数据", httpMethod = "DELETE")

4
pluss-api-page/src/main/java/cn/pluss/platform/controller/store/MercOrderDetailController.java
View File

@ -121,8 +121,8 @@ public class MercOrderDetailController {
* 查看物流信息（快递鸟）
*/
@GetMapping("/logistic")
public Result<Object> logistic(@RequestParam String expressNo)throws Exception{
JSONObject expressInfo = mercOrderExpressService.getExpressInfo(expressNo);
public Result<Object> logistic(@RequestParam String orderNo)throws Exception{
JSONObject expressInfo = mercOrderExpressService.getExpressInfo(orderNo);
if (expressInfo.isEmpty()){
return ResultGenerator.genFailResult("无法查询快递信息");
}else {

2
pluss-api-page/src/main/resources/application-prod.yml
View File

@ -1,6 +1,6 @@
spring:
datasource:
url: jdbc:mysql://rm-bp19ib8x213kh9t45.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
url: jdbc:mysql://rm-bp19ib8x213kh9t450o.rwlb.rds.aliyuncs.com:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root
password: prodCZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver

6
pluss-api-page/src/main/resources/application.yml
View File

@ -5,7 +5,7 @@ spring:
profiles:
### 将一些固定的配置放到下级文件夹下的yml文件中
include: common, ryx, ys
active: dev
active: prod
mvc:
view:
prefix: /WEB-INF/jsp/
@ -22,6 +22,6 @@ spring:
max-size: 20
server:
servlet:
context-path: /api
# servlet:
# context-path: /api
port: 7004

4
pluss-manage-page/src/main/resources/application-dev.yml
View File

@ -1,8 +1,8 @@
spring:
datasource:
druid:
url: jdbc:mysql://127.0.0.1:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true
username: chaozhanggui
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8&noAccessToProcedureBodies=true&allowMultiQueries=true
username: root
password: CZGmysqlroot@123
driver-class-name: com.mysql.jdbc.Driver
# datasource:

2
pluss-manage-page/src/main/resources/application.yml
View File

@ -29,8 +29,6 @@ spring:
server:
port: 8083
servlet:
context-path: /manage
compression:
enabled: true
mime-types: application/json

2
pluss-service-bundle/src/main/java/cn/pluss/platform/app/impl/AgentStaffMainPageServiceImpl.java
View File

@ -61,7 +61,7 @@ public class AgentStaffMainPageServiceImpl implements MainPageService {
Double promoteConsumeFee;
Integer totalOrderCount;
//分润
//快银收银
Map<String, Object> queryMap = new HashMap<>();
queryMap.put("userId", queryUserApp.getParentId());
queryMap.put("agentStaffId", userId);

2
pluss-service-bundle/src/main/java/cn/pluss/platform/device/MercOrderExpressService.java
View File

@ -10,5 +10,5 @@ public interface MercOrderExpressService extends IService<MercOrderExpress> {
MercOrderExpress getByExpressNo(String expressNo);
JSONObject getExpressInfo(String expressNo) throws Exception;
JSONObject getExpressInfo(String orderNo) throws Exception;
}

25
pluss-service-bundle/src/main/java/cn/pluss/platform/device/impl/MercOrderExpressServiceImpl.java
View File

@ -1,27 +1,34 @@
package cn.pluss.platform.device.impl;
import cn.pluss.platform.device.MercOrderDetailService;
import cn.pluss.platform.device.MercOrderExpressService;
import cn.pluss.platform.entity.MercOrderDetail;
import cn.pluss.platform.entity.MercOrderExpress;
import cn.pluss.platform.enums.LogisticProvider;
import cn.pluss.platform.exception.MsgException;
import cn.pluss.platform.mapper.MercOrderExpressMapper;
import cn.pluss.platform.util.*;
import cn.pluss.platform.vo.MercOrderExpressVO;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.net.URLEncoder;
import java.nio.charset.StandardCharsets;
import java.util.Base64;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@Slf4j
@Service
public class MercOrderExpressServiceImpl extends ServiceImpl<MercOrderExpressMapper, MercOrderExpress> implements MercOrderExpressService {
public static final String CHECK_Express = "https://api.kdniao.com/Ebusiness/EbusinessOrderHandle.aspx";
@Resource
private MercOrderDetailService mercOrderDetailService;
/**
* 根据上送物流单号查询商户单号
* @param logistNo
@ -38,23 +45,27 @@ public class MercOrderExpressServiceImpl extends ServiceImpl<MercOrderExpressMap
}
@Override
public JSONObject getExpressInfo(String expressNo) throws Exception {
if (expressNo.isEmpty()){
public JSONObject getExpressInfo(String orderNo) throws Exception {
List<MercOrderDetail> detailByOrderNo = mercOrderDetailService.getDetailByOrderNo(orderNo, "01");
if (detailByOrderNo == null || detailByOrderNo.get(0).getExpressNo() == null){
throw new MsgException("暂无相应的快递单号");
}
JSONObject reqData = new JSONObject();
String subThree = expressNo.substring(0, 3);
String subThree = detailByOrderNo.get(0).getExpressNo();
if ("268".equals(subThree) || "368".equals(subThree) || "468".equals(subThree)|| "334".equals(subThree)
|| "888".equals(subThree) || "77".equals(expressNo.substring(0,2))){
|| "888".equals(subThree) || "77".equals(detailByOrderNo.get(0).getExpressNo().substring(0,2))){
reqData.put("ShipperCode", LogisticProvider.STO.getCode());
} else if ("YT".equals(expressNo.substring(0,2))){
} else if ("YT".equals(detailByOrderNo.get(0).getExpressNo().substring(0,2))){
reqData.put("ShipperCode", LogisticProvider.YTO.getCode());
} else if ("55".equals(expressNo.substring(0,2))){
} else if ("55".equals(detailByOrderNo.get(0).getExpressNo().substring(0,2))){
reqData.put("ShipperCode", LogisticProvider.HTKY.getCode());
}else {
return new JSONObject();
}
reqData.put("LogisticCode", expressNo);
reqData.put("LogisticCode", detailByOrderNo.get(0).getExpressNo());
JSONObject jsonObject = reqJsonData(reqData);
if (!(Boolean) jsonObject.get("Success")){

2
pluss-service-bundle/src/main/java/cn/pluss/platform/merchantMenber/impl/MerchantMenberServiceImpl.java
View File

@ -383,7 +383,7 @@ public class MerchantMenberServiceImpl extends ServiceImpl<MerchantMenberMapper,
String[] array = {menber.getMemberCode(),amt.toString(), DateUtils.toString(new Date(),"yyyy-MM-dd HH:mm:ss"),transTitle, useFee};
WxAccessTokenRequest request = WxAccessTokenRequest.buidWxToken(ParametersUtil.APPID, ParametersUtil.APPSECRET, null, WxConstants.ACCESS_TOKEN_URL);
//TODO miniprogram后续小程序调整好后再接
WxTemolateRequest temolateRequest = new WxTemolateRequest(menber.getOpenid(),WxConstants.VIP_BALANCE_CHANGE_TEMPLATE_ID,null,null)
WxTemolateRequest temolateRequest = new WxTemolateRequest(menber.getOpenid(),WxConstants.VIP_BALANCE_CHANGE_TEMPLATE_ID,null,miniprogram)
.buildData(first,remark,array);
wxCommonService.sendTemplateMsg(temolateRequest,request);
}

4
pluss-service-bundle/src/main/java/cn/pluss/platform/pay/impl/ApiPayServiceImpl.java
View File

@ -705,8 +705,8 @@ public class ApiPayServiceImpl implements ApiPayService {
order.setAlias(merchant.getMerchantName());
try {
//TODO测试金额上线会删除
order.setConsumeFee(0.01);
// TODO 测试金额上线会删除
order.setConsumeFee(mercOrderNew.getActualAmt().doubleValue());
JSONObject result = sxfPayService.tradePay(order, channel,merchant);

2
pluss-service-bundle/src/main/java/cn/pluss/platform/ys/edit/YsChangeRateServiceImpl.java
View File

@ -91,7 +91,7 @@ public class YsChangeRateServiceImpl extends BaseMchChannelRateNewService {
rateNewRecordService.save(mrnr);
// 上传一张空白图作为结算信息修改申请表
((YsAuditServiceImpl) ysAuditServiceV2).imageUploadEdit("https://www.shouyinbei.net/resources/images/upload/blank.png", "B008", changeFlowId);
((YsAuditServiceImpl) ysAuditServiceV2).imageUploadEdit("https://www.shouyinbei.net/resources快银收银s/upload/blank.png", "B008", changeFlowId);
}
@Override

3
pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java
View File

@ -82,6 +82,7 @@ public class WechantController {
private RestTemplate restTemplate;
@Resource
private MerchantBaseInfoService merchantBaseInfoService;
/**
*
* goUpgradePage:(跳转到升级页面). <br/>
@ -481,7 +482,9 @@ public class WechantController {
@ResponseBody
public Result<Object> orderPay(@RequestBody JSONObject params) {
String openid = params.getString("openid");
System.out.println("openid"+openid);
String orderNumber = params.getString("orderNumber");
System.out.println("orderNumber"+orderNumber);
return apiPayService.orderPay(openid,orderNumber);
}

5
pluss-wap-page/src/main/resources/application.yml
View File

@ -1,14 +1,15 @@
server:
port: 8084
servlet:
context-path: /wap
port: 8084
spring:
main:
allow-bean-definition-overriding: true
profiles:
include: common, ryx, ys
active: dev
active: prod
datasource:
url: jdbc:mysql://60.205.224.68:3306/chaozhanggui?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=GMT%2B8
username: root