Merge branch 'zx_1026_1111' of http://git.dayaedu.com/yonge/mec into test

mec-biz/src/main/resources/config/mybatis/StudentPaymentOrderMapper.xml

@@ -1349,9 +1349,6 @@
             <if test="organId != null">
                 AND find_in_set(t.organ_id_,#{organId})
             </if>
-            <if test="organId != null">
-                AND t.organ_id_ = #{organId}
-            </if>
             <if test="userName != null and userName.trim() !=''">
                 AND su.username_ like concat('%',#{userName},'%')
             </if>

mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/config/ResourceServerConfig.java

@@ -26,7 +26,7 @@ public class ResourceServerConfig extends ResourceServerConfigurerAdapter {
         http.csrf().disable().exceptionHandling().accessDeniedHandler(baseAccessDeniedHandler).authenticationEntryPoint(baseAuthenticationEntryPoint).and()
             .authorizeRequests().antMatchers("/task/**").hasIpAddress("0.0.0.0/0")
                 .and()
-                .authorizeRequests().antMatchers("/wechat/*","/v2/api-docs", "/code/*","/payment/callback","/order/adapayNo/list",
+                .authorizeRequests().antMatchers("/wechat/*","/v2/api-docs", "/code/*","/payment/callback","/payment/callback_yee/*","/order/adapayNo/list",
                  "/order/paySuccess/test","/order/cancelUserOrder/test","/open/**","/task/**","/order/detail/sn/**","/cart/addAll","/order/generateOrder")
             .permitAll().anyRequest().authenticated().and().httpBasic();
     }

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

@@ -160,6 +160,7 @@ public class PaymentController extends BaseController {
     public Object callback_yee(@PathVariable("tenantId") Integer tenantId, HttpServletRequest request) {
         try {
             String content = request.getParameter("response");
+            log.info("易宝支付回调信息：content:{}", content);
             JSONObject dataObj = JSON.parseObject(content);
             String orderNo = dataObj.getString("orderId");
             UserOrderPayment userOrderPayment = userOrderPaymentService.getByAdapayNo(orderNo);
@@ -179,7 +180,7 @@ public class PaymentController extends BaseController {
 
             dto = DigitalEnvelopeUtils.decrypt(dto, privateKey, publicKey);
 
-            log.info("易宝支付回调信息：response:{} plaintText:{}", content, dto.getPlainText());
+            log.info("易宝支付回调信息：plaintText:{}", dto.getPlainText());
             if("SUCCESS".equals(dataObj.getString("status"))) {
                 orderService.paymentSucceededHandle(orderNo,
                         dataObj.getBigDecimal("orderAmount"),dataObj.getString("channel"));