feat：“添加长隆微信支付“

src/main/java/com/szwl/controller/TEquipmentApplyController.java

@@ -244,7 +244,7 @@ public class TEquipmentApplyController {
                         equipment.setCompanyType(companyType); // 公司平台
                         equipment.setMachineType(machineType); // 设备类型
                         //设置默认规则
-                        equipment.setTimeRuleId(Long.valueOf(1));
+                        equipment.setTimeRuleId(1L);
                         if(equimentType.equals("MG320-1")){
                             equipment.setEquimentType("MG320");
                         }else {
@@ -298,6 +298,7 @@ public class TEquipmentApplyController {
                         }
                         TEquipmentDesc equipmentDesc = new TEquipmentDesc();
                         equipmentDesc.setEquipmentId(tEquipment.getId());
+                        equipmentDesc.setFlowers(tEquipment.getFlowers());
                         equipmentDescService.save(equipmentDesc);
 
                     } else if (status.equals("unAgreed")) {

src/main/java/com/szwl/controller/TOrderController.java

@@ -113,10 +113,10 @@ public class TOrderController {
             return R.fail(ResponseCodesEnum.A0002,"订单非支付状态");
         }
         //判断是不是直连微信退款
-        if(StringUtils.isNotEmpty(order.getPayPlatform())&&order.getPayPlatform().equals("3")){
-            String ifSuccess = R.getDataIfSuccess(payFeign.refund(order.getSn(),refusePrice));
-            return R.ok(ifSuccess);
-        }
+//        if(StringUtils.isNotEmpty(order.getPayPlatform())&&order.getPayPlatform().equals("3")){
+//            String ifSuccess = R.getDataIfSuccess(payFeign.refund(order.getSn(),refusePrice));
+//            return R.ok(ifSuccess);
+//        }
 
         String notifyUrl = JoinpayConstant.Notify_Refund_Url;
 
@@ -152,7 +152,6 @@ public class TOrderController {
                 refInfo.put("altMchNo", altInfoObject.getString("altMchNo"));
                 String altAmount = altInfoObject.getString("altAmount");
                 BigDecimal altAmountPrice = new BigDecimal(altAmount);
-//                altAmountPrice = altAmountPrice.multiply(refusePrice.divide(order.getPrice(),2,BigDecimal.ROUND_HALF_UP)).setScale(2, RoundingMode.HALF_DOWN);
                 p = p.add(altAmountPrice);
                 refInfo.put("altRefAmount", altAmountPrice.toString());
                 if(order.getMarketingAmount()!=null){
@@ -174,9 +173,6 @@ public class TOrderController {
                 String altAmount = altInfoObject.getString("altAmount");
 
                 BigDecimal altAmountPrice = new BigDecimal(altAmount).setScale(2, RoundingMode.HALF_DOWN);
-//                BigDecimal divide = altAmountPrice.divide(order.getPrice(),3,BigDecimal.ROUND_HALF_UP).setScale(3, RoundingMode.HALF_DOWN);
-//                altAmountPrice = refusePrice.multiply(divide).setScale(2, RoundingMode.HALF_DOWN);
-//                refInfo.put("altRefAmount", altAmountPrice.toString());
                 p = p.add(altAmountPrice);
                 refInfo.put("altRefAmount", altAmountPrice.toString());
                 if(order.getMarketingAmount()!=null){
@@ -207,7 +203,6 @@ public class TOrderController {
                 Date date = order.getCreateDate();
                 String payDate = DateTools.formatYYYYMMDD(date);
                 String remark = "";
-//                BigDecimal refundAmount = order.getRefundAmount();
                 // 判断是否退过款
                 if(refundAmount != null && refundAmount.compareTo(BigDecimal.ZERO) > 0) {
                     acctSplitBunch = getAcctSplitBunch(proportion, refusePrice, companyType).toString();

src/main/java/com/szwl/mapper/xml/TAdminMapper.xml

@@ -43,11 +43,12 @@
         <result column="company_type" property="companyType" />
         <result column="currency_symbol" property="currencySymbol" />
         <result column="diy_password" property="diyPassword" />
+        <result column="wechat_pay_id" property="wechatPayId" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_date, modify_date, agency_id, area_id, qr_code_img_url, department, email, is_admined, is_enabled, is_locked, locked_date, login_date, login_failure_count, login_ip, merchant_id, trade_merchant_no, name, parent_id, password, personage_id, notice_id, type, username, phone, is_refund, if_foreign, open, promo_code_open, apply_start_time, apply_end_time, code, pay_platform, logo_rule, relation_admin_id, manager_id, company_type, currency_symbol, diy_password
+        id, create_date, modify_date, agency_id, area_id, qr_code_img_url, department, email, is_admined, is_enabled, is_locked, locked_date, login_date, login_failure_count, login_ip, merchant_id, trade_merchant_no, name, parent_id, password, personage_id, notice_id, type, username, phone, is_refund, if_foreign, open, promo_code_open, apply_start_time, apply_end_time, code, pay_platform, logo_rule, relation_admin_id, manager_id, company_type, currency_symbol, diy_password, wechat_pay_id
     </sql>
     <select id="queryByXml" resultType="com.szwl.model.entity.TAdmin">
         select * from t_admin a

src/main/java/com/szwl/model/entity/TAdmin.java

@@ -19,7 +19,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-09-26
+ * @since 2024-03-08
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -151,5 +151,8 @@ public class TAdmin implements Serializable {
     @ApiModelProperty(value = "DIY功能使用密码")
     private String diyPassword;
 
+    @ApiModelProperty(value = "微信支付配置ID")
+    private Long wechatPayId;
+
 
 }