支付组件

mec-application/src/main/java/com/ym/mec/student/controller/StudentOrderController.java

@@ -32,17 +32,16 @@ import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
-import lombok.Data;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.http.HttpStatus;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
@@ -57,67 +56,65 @@ import java.util.stream.Collectors;
 @EnableScheduling
 public class StudentOrderController extends BaseController {
     private static final Logger logger = LoggerFactory.getLogger(StudentOrderController.class);
-    @Autowired
+    @Resource
     private StudentPaymentOrderService studentPaymentOrderService;
-    @Autowired
+    @Resource
     private VipGroupService vipGroupService;
-    @Autowired
+    @Resource
     private MusicGroupService musicGroupService;
-    @Autowired
+    @Resource
     private StudentPaymentOrderDetailService studentPaymentOrderDetailService;
-    @Autowired
+    @Resource
     private StudentPaymentOrderDao studentPaymentOrderDao;
-    @Autowired
+    @Resource
     private SysConfigDao sysConfigDao;
-    @Autowired
+    @Resource
     private SporadicChargeInfoService sporadicChargeInfoService;
-    @Autowired
+    @Resource
     private OrganizationDao organizationDao;
-    @Autowired
+    @Resource
     private CourseScheduleEvaluateDao courseScheduleEvaluateDao;
-    @Autowired
+    @Resource
     private StudentGoodsSellDao studentGoodsSellDao;
-    @Autowired
+    @Resource
     private LuckDrawCountService luckDrawCountService;
-    @Autowired
+    @Resource
     private DegreeRegistrationDao degreeRegistrationDao;
-    @Autowired
+    @Resource
     private SysUserFeignService sysUserFeignService;
-    @Autowired
+    @Resource
     private MusicGroupPaymentCalenderDao musicGroupPaymentCalenderDao;
-    @Autowired
+    @Resource
     private MusicGroupPaymentCalenderCourseSettingsDao musicGroupPaymentCalenderCourseSettingsDao;
-    @Autowired
+    @Resource
     private ReplacementInstrumentActivityDao replacementInstrumentActivityDao;
-    @Autowired
+    @Resource
     private CloudTeacherOrderService cloudTeacherOrderService;
-    @Autowired
+    @Resource
     private SysCouponCodeDao sysCouponCodeDao;
-    @Autowired
+    @Resource
     private StudentRegistrationDao studentRegistrationDao;
-    @Autowired
+    @Resource
     private VipGroupActivityService vipGroupActivityService;
-    @Autowired
+    @Resource
     private TenantOrderRecordService tenantOrderRecordService;
-    @Autowired
+    @Resource
     private OrderPayOpsService orderPayOpsService;
-    @Autowired
+    @Resource
     private MusicGroupPaymentCalenderActivityService musicGroupPaymentCalenderActivityService;
-    @Autowired
+    @Resource
     private TenantConfigService tenantConfigService;
-    @Autowired
+    @Resource
     private OrganizationService organizationService;
-    @Autowired
+    @Resource
     private VipGroupCategoryDao vipGroupCategoryDao;
-    @Autowired
+    @Resource
     private TempBuyDoubleElevenUserLogDao tempBuyDoubleElevenUserLogDao;
-    @Autowired
-    private HfMerchantConfigService hfMerchantConfigService;
-    @Autowired
+    @Resource
     private TempDirectorTrainingCampDetailService tempDirectorTrainingCampDetailService;
-    @Autowired
+    @Resource
     private MusicGroupPaymentCalenderMemberService musicGroupPaymentCalenderMemberService;
-    @Autowired
+    @Resource
     private PaymentServiceContext paymentServiceContext;
 
     @Value("${spring.profiles.active:dev}")

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

@@ -33,8 +33,13 @@
 
 	<!-- 全查询 -->
 	<select id="findAll" resultMap="HfMerchantConfig">
-		SELECT * FROM hf_merchant_config WHERE payer_name_ = #{payerName} ORDER
-		BY id_
+		SELECT * FROM hf_merchant_config
+		<where>
+			<if test="payerName != null and payerName != ''">
+				AND payer_name_ = #{payerName}
+			</if>
+		</where>
+		ORDER BY id_
 	</select>
 
 	<!-- 向数据库增加一条记录 -->