自动周转分组规则、paypal帐号信息修改

data-base/base-sync-company/src/main/java/com/bailuntec/domain/pojo/PaypalAccountInfo.java

@@ -23,6 +23,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "Seller")
     private String seller;
 
     /**
@@ -32,6 +33,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "SellerPassword")
     private String sellerPassword;
 
     /**
@@ -41,6 +43,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "SellerUser")
     private String sellerUser;
 
     /**
@@ -50,6 +53,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "Abbreviation")
     private String abbreviation;
 
     /**
@@ -59,6 +63,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "PhoneNumber")
     private String phoneNumber;
 
     /**
@@ -68,6 +73,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "PhoneNumberUser")
     private String phoneNumberUser;
 
     /**
@@ -77,6 +83,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "Merchant")
     private String merchant;
 
     /**
@@ -86,6 +93,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "CreditCard")
     private String creditCard;
 
     /**
@@ -95,6 +103,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "CreditCardUser")
     private String creditCardUser;
 
     /**
@@ -104,6 +113,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "CreditCardExpirationDate")
     private Date creditCardExpirationDate;
 
     /**
@@ -113,6 +123,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "WithdrawBank")
     private String withdrawBank;
 
     /**
@@ -122,6 +133,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "ApiUserName")
     private String apiUserName;
 
     /**
@@ -131,6 +143,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "ApiPassword")
     private String apiPassword;
 
     /**
@@ -140,6 +153,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "ApiSignature")
     private String apiSignature;
 
     /**
@@ -149,6 +163,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "AuthJson")
     private String authJson;
 
     /**
@@ -158,6 +173,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "AuthTime")
     private Date authTime;
 
     /**
@@ -167,6 +183,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "AuthTokenExpireTime")
     private Date authTokenExpireTime;
 
     /**
@@ -176,6 +193,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "CreateUserId")
     private Integer createUserId;
 
     /**
@@ -185,6 +203,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "CreateUserName")
     private String createUserName;
 
     /**
@@ -194,6 +213,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "CreateTime")
     private Date createTime;
 
     /**
@@ -203,6 +223,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "ModifyUserId")
     private Integer modifyUserId;
 
     /**
@@ -212,6 +233,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "ModifyUserName")
     private String modifyUserName;
 
     /**
@@ -221,6 +243,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "ModifyTime")
     private Date modifyTime;
 
     /**
@@ -230,6 +253,7 @@ public class PaypalAccountInfo {
      *
      * @mbg.generated
      */
+    @JSONField(name = "CompanyId")
     private Integer companyId;
 
     /**

data-base/base-sync-company/src/main/java/com/bailuntec/job/PaypalAccountSyncJob.java

@@ -57,7 +57,7 @@ public class PaypalAccountSyncJob extends PointJob {
                     DcBasePaypalAccount dcBasePaypalAccount = new DcBasePaypalAccount();
                     try {
                         for (PaypalAccountInfo paypalAccountInfo : result) {
-                            BeanUtils.copyProperties(paypalAccountInfo, dcBasePaypalAccount);
+                            BeanUtils.copyProperties(dcBasePaypalAccount, paypalAccountInfo);
                             dcBasePaypalAccount.setId(null);
                             int i = mapper.updateByExampleSelective(dcBasePaypalAccount, DcBasePaypalAccountExample.newAndCreateCriteria().andPaypalIdEqualTo(dcBasePaypalAccount.getPaypalId()).example());
                             if (i == 0) {

data-show/show-auto-turnover/src/main/java/com/bailuntec/job/AutoTurnoverJob.java

@@ -1879,7 +1879,7 @@ public class AutoTurnoverJob extends PointJob {
         if (dcAutoStockUpRange != null) {
             dcAutoJitTags = dcAutoJitTagMapper.selectByExample(DcAutoJitTagExample.newAndCreateCriteria().andGroupIdEqualTo(dcAutoStockUpRange.getGroupId()).example());
         } else {
-            dcAutoJitTags = dcAutoJitTagMapper.selectByExample(DcAutoJitTagExample.newAndCreateCriteria().example());
+            dcAutoJitTags = dcAutoJitTagMapper.selectByExample(DcAutoJitTagExample.newAndCreateCriteria().andGroupIdEqualTo(1).example());
         }
         BigDecimal saveDays = BigDecimal.ZERO;
         if (dcAutoJitTags != null) {