zhs 3 роки тому
батько
коміт
fe6dd3197e

+ 1 - 1
src/main/java/com/travel/controller/ConfirmOrderingController.java

@@ -84,7 +84,7 @@ public class ConfirmOrderingController {
             List<Release> list1 = privateOrderService.getPrivateTypeVal(privateOrder1);
             for(Release release1 : list1){
                 //判断不是当前报价单的供应商返回次数
-                if(!release1.getCode().equals(confirmOrdering.getSupplierCode())){
+                if(!release1.getCode().equals(confirmOrdering.getSupplierCode()) && !release1.getCode().equals("0000000000")){
                     privateOrderService.updateSupplierOffer(release1);
                 }
             }

+ 3 - 1
src/main/java/com/travel/controller/SupplierController.java

@@ -211,7 +211,9 @@ public class SupplierController {
                     user1.setName("TUYAGYS_" + user1.getId())
                             .setCode(PersonalController.SerialNumber("SUP", user1.getId() + ""))
                             .setHeadpir("https://lidaotech.oss-cn-beijing.aliyuncs.com/test/%E5%BE%AE%E4%BF%A1%E5%9B%BE%E7%89%87_20220622112747.png")
-                            .setCaptcha("null");
+                            .setCaptcha("null")
+                            .setAccountAssociated("0")//为主账号
+                            .setPermissionsType("0");//超管;
                     supplierService.upddateSupplier(user1);
 //                    return map;
                 } else {

+ 2 - 2
src/main/resources/config/mapping/ZFBPayMapper.xml

@@ -112,8 +112,8 @@
     </select>
     <!-- 添加购买次数记录 -->
     <insert id="addBuyOfferNum" parameterType="BuyOfferNum">
-        insert into bus_buy_offer_num(uuid,jdrq,pay_amount,offer_num,code,pay_amount,pay_type)
-        values(#{uuid},CONVERT(VARCHAR(100), SYSDATETIME(), 20),#{payAmount},#{offerNum},#{code},{payAmount},{payType})
+        insert into bus_buy_offer_num(uuid,jdrq,pay_amount,offer_num,code,pay_type)
+        values(#{uuid},CONVERT(VARCHAR(100), SYSDATETIME(), 20),#{payAmount},#{offerNum},#{code},#{payType})
     </insert>
     <!-- 供应商余额充值记录 -->
     <insert id="buySupplierBalance" parameterType="WxPay">