fix

cooleshow-mall/mall-admin/src/main/resources/config/mybatis/PmsProductDao.xml

@@ -79,6 +79,7 @@
         </if>
 
         <where>
+            pp.delete_status = 0
             <if test="param.publishStatus != null">
                 and pp.publish_status = #{param.publishStatus}
             </if>

cooleshow-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/controller/PaymentController.java

@@ -1,8 +1,5 @@
 package com.yonge.cooleshow.portal.controller;
 
-import com.github.binarywang.wxpay.bean.notify.SignatureHeader;
-import com.github.binarywang.wxpay.bean.notify.WxPayOrderNotifyV3Result;
-import com.github.binarywang.wxpay.service.WxPayService;
 import com.yonge.cooleshow.auth.api.client.SysUserFeignService;
 import com.yonge.cooleshow.auth.api.entity.SysUser;
 import com.yonge.cooleshow.common.controller.BaseController;
@@ -25,8 +22,6 @@ import com.yonge.toolset.payment.base.model.Payment;
 import com.yonge.toolset.payment.base.model.callback.PaymentCallBack;
 import com.yonge.toolset.payment.core.props.PaymentProperties;
 import com.yonge.toolset.payment.core.service.PaymentClient;
-import com.yonge.toolset.payment.core.service.SysConfigPaymentService;
-import com.yonge.toolset.payment.original.wx.constant.WxpayConstant;
 import com.yonge.toolset.utils.web.WebUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -59,10 +54,6 @@ public class PaymentController extends BaseController {
     private PaymentClient paymentClient;
     @Autowired
     private PaymentProperties paymentProperties;
-    @Autowired
-    private SysConfigPaymentService configPaymentService;
-    @Autowired
-    private WxPayService wxPayService;
 
     @Autowired
     private OmsPortalOrderService orderService;
@@ -170,25 +161,4 @@ public class PaymentController extends BaseController {
         return res.getData().getResMsg();
     }
 
-
-    // private Object wxAppCallbackHandle(String payMethod, HttpServletRequest request) throws Exception {
-    //     String merchantId = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_MERCHANT_ID).getParamValue();
-    //     String apiV3Key = configPaymentService.getPaymentConfig(OpenEnum.ORIGINAL, WxpayConstant.WX_API_V3_KEY).getParamValue();
-    //
-    //     //支付回调
-    //     if ("executePayment".equals(payMethod)) {
-    //         SignatureHeader header = new SignatureHeader();
-    //         header.setTimeStamp(request.getHeader("Wechatpay-Timestamp"));
-    //         header.setNonce(request.getHeader("Wechatpay-Nonce"));
-    //         header.setSerial(request.getHeader("Wechatpay-Serial"));
-    //         header.setSignature(request.getHeader("Wechatpay-Signature"));
-    //
-    //         String params = WebUtil.getBodyData(request);
-    //
-    //         WxPayOrderNotifyV3Result wxPayOrderNotifyV3Result = wxPayService.parseOrderNotifyV3Result(params, header);
-    //
-    //     }
-    //     return null;
-    // }
-
 }