Просмотр исходного кода

Merge branch 'release_toaliyun_real_2022_init' of https://git.malls.iformall.com/server/formallProject into release_toaliyun_real_2022_init

release_toaliyun_real
winter 4 лет назад
Родитель
Сommit
8b301c1862
7 измененных файлов: 19 добавлений и 11 удалений
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java
  2. +2
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  3. +4
    -4
      mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java
  5. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  7. +4
    -2
      mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/app/WxAppinfoController.java Просмотреть файл

@@ -175,14 +175,14 @@ public class WxAppinfoController extends BaseController {
// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
// }
WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(ifParentUpdateAloneTenantInfo().getTenantId(), null);
return new ResultData(cAppInfo);
return new ResultData(new WxAppinfo(cAppInfo.getMouldType()));
}

@PostMapping("updateAppMouldType")
@SystemControllerLog(description = "修改小程序首页风格")
public ResultData updateAppMouldType(@RequestBody WxAppinfo appinfo) {
logger.debug("[" + getIpAddr() + "] WxAppinfoController::updateAppMouldType");
if(appinfo == null || appinfo.getId() == null || appinfo.getMouldType() == null){
if(appinfo.getMouldType() == null){
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
// WxAppinfo updateAppinfo = new WxAppinfo();


+ 2
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java Просмотреть файл

@@ -531,6 +531,7 @@ public class WxInfoController extends BaseController {
// return new ResultData(ErrorCode.SYS_PARAMETER_ERROR);
// }
WxAppinfo cAppInfo = wxAppinfoService.getCAppInfoFromRedis(getTenantInfo().getTenantId(), null);
return new ResultData(cAppInfo);

return new ResultData(new WxAppinfo(cAppInfo.getMouldType()));
}
}

+ 4
- 4
mallinkCallback/src/main/java/com/iformall/controller/callback/TtPayController.java Просмотреть файл

@@ -71,7 +71,7 @@ public class TtPayController extends BaseController {
@PostMapping(value = "/orderPay")
@ResponseBody
public Map<String,Object> createOrder( @RequestBody Map<String, Object> parameterMap){
logger.debug("[" + getIpAddr() + "] TtOrderCallbackController::createOrder");
logger.debug("[" + getIpAddr() + "] TtOrderCallbackController::orderPay");
Map<String,Object> resultMap = new HashMap<>();

// String body = ((BodyReaderHttpServletRequestWrapper) request).getBody();
@@ -123,13 +123,13 @@ public class TtPayController extends BaseController {
}else if("refund".equals(type)){//退款回调
String cp_refundno = (String) pMap.get("cp_refundno");
String status = (String) pMap.get("status");
String refund_amount = (String) pMap.get("refund_amount");
Integer refund_amount = (Integer) pMap.get("refund_amount");

Map<String,String> map = new HashMap<>();
map.put("appid",appid);
map.put("cp_refundno",cp_refundno);
map.put("status",status);
map.put("refund_amount",refund_amount);
map.put("refund_amount",refund_amount.toString());
wxRefundOrderService.notify(map, EnumPayWay.PAY_WAY_TT);
resultMap.put("err_no",0);
resultMap.put("err_tips","success");
@@ -137,7 +137,7 @@ public class TtPayController extends BaseController {

return resultMap;
} catch (Exception e){
e.printStackTrace();
logger.error(e.getMessage());
resultMap.put("err_tips","error");
return resultMap;
}


+ 5
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxAppinfo.java Просмотреть файл

@@ -46,4 +46,9 @@ public class WxAppinfo extends BaseTenantEntity {
private Integer enable;
@io.swagger.annotations.ApiModelProperty(value="app平台 EnumAppPlat ",name="plat")
private Integer plat;

public WxAppinfo(){}
public WxAppinfo(Integer mouldType){
this.mouldType = mouldType;
}
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCouponOrderMapper.java Просмотреть файл

@@ -50,7 +50,7 @@ public interface WxCouponOrderMapper extends CommonMapper<WxCouponOrder, Long> {
WxCouponOrder findDetailOfCUser(@Param("id")Long id,@Param("tenantId")String tenantId);
List<WxCouponOrder> findListOfAdmin(WxCouponOrderBVo wxCouponOrder);
WxCouponOrder findDetailOfAdmin(@Param("id")Long id,@Param("tenantId")String tenantId,@Param("finalTenantId")String finalTenantId);
WxCouponOrder findDetailOfAdmin(@Param("id")Long id,@Param("tenantId")String tenantId);

//营销报表 券数据图表
//List<MarkingCouponDataReportVo> couponDataMap(HashMap<String,Object> params);


+ 1
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Просмотреть файл

@@ -1163,7 +1163,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
@Override
public ResultData detailAdminVo(Long couponOrderId,TenantEntity tenantinfo) {

WxCouponOrder couponOrder = wxCouponOrderMapper.findDetailOfAdmin(couponOrderId,tenantinfo.getTenantId(),tenantinfo.getFinalTenantId());
WxCouponOrder couponOrder = wxCouponOrderMapper.findDetailOfAdmin(couponOrderId,tenantinfo.getTenantId());
if (null == couponOrder) {
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL);
}


+ 4
- 2
mallinkService/src/main/java/com/iformall/service/pay/service/refund/douyin/TtRefundAdapterService.java Просмотреть файл

@@ -101,6 +101,8 @@ public class TtRefundAdapterService implements RefundPayAdapterService{
@Override
public RefundNotifyAdapterResult notify(Map<String, String> paramMap, EnumPayWay payWay) {
log.info("TtRefundAdapterService notify{}"+paramMap);

String appId = paramMap.get("appid");
WxAppinfo appinfo = wxAppinfoMapper.findByAppId(appId);
if (appinfo == null) {
@@ -113,7 +115,7 @@ public class TtRefundAdapterService implements RefundPayAdapterService{
throw new MallinkException(ErrorCode.MCH_INFO_NOT_FOUND);
}
if (!"SUCCESS".equals(paramMap.get("status"))) {
log.warn("notify refund, wxpay status not success, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString());
log.error("notify refund, wxpay status not success, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString());
return notifyErrorResult("订单状态码非SUCCESS");
}
String refundno = paramMap.get("cp_refundno");
@@ -121,7 +123,7 @@ public class TtRefundAdapterService implements RefundPayAdapterService{
WxRefundOrder refundOrder = wxRefundOrderMapper.selectById(refundOrderId);
// 验证退款金额
if (!paramMap.get("refund_amount").equals(refundOrder.getRefundFee().toString())) {
log.warn("notify refund, wxpay check refund_fee is invalid, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString());
log.error("notify refund, wxpay check refund_fee is invalid, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString());
return notifyErrorResult("退款总金额不一致");
}
log.info("notify refund, wxpay checksign success, paramMap:{}, paramMap: " + paramMap.toString() + ", payWay:" + payWay.toString());


Загрузка…
Отмена
Сохранить