diff --git a/AllBase/BaseClass.cs b/AllBase/BaseClass.cs index 29b14de..f891a51 100644 --- a/AllBase/BaseClass.cs +++ b/AllBase/BaseClass.cs @@ -27,8 +27,9 @@ namespace AllBase /// /// 版本ID /// - public static int VersionCount = 1115; - public static string MainPath = "29wx"; + public static int VersionCount = 1119; + public static string MainPath = "29pdd"; + //public static string MainPath = "29pdd"; //public static string MainPath = "kuajingda"; //public static int VersionCount = 613; diff --git a/KJDService/KJD_WebService/BLL/KJD/UpadteManage.cs b/KJDService/KJD_WebService/BLL/KJD/UpadteManage.cs index 1c44fc1..a0f925c 100644 --- a/KJDService/KJD_WebService/BLL/KJD/UpadteManage.cs +++ b/KJDService/KJD_WebService/BLL/KJD/UpadteManage.cs @@ -72,7 +72,7 @@ namespace KJD_Web.BLL if (version > LowVersion.ParseToInt()) { return "{\"code\":200,\"msg\":\"success\",\"next_version\":" + serverVersion + ",\"exe_check\":\"" + UpdateExeChk + - "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateNewUrl + "\"}"; + "\",\"exe_address\":\"" + UpdateExe + "\",\"file_address\":\"" + UpdateNewUrl + "Update" + serverVersion + ".zip\"}"; } else if (version > 0) { diff --git a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs index a8b008c..c414801 100644 --- a/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs +++ b/KJDService/KJD_WebService/BLL/WXXD/WXUserManage.cs @@ -852,6 +852,70 @@ namespace KJD_Web.BLL.WXXD return "{\"code\":19999,\"msg\":\"输入为空\"}"; } + /// + /// 充值二维码 + /// + /// + /// + public string UpdateTopUpQrcode(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + + var qrcode_base64 = (RegexUtils.GetStringQuery(ref inputData, "qrcode_base64")?.Replace("'", "\\'")); + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + string sql = "UPDATE wxxd.user_top_up_qrcode SET qrcode_base64='" + qrcode_base64 + "' WHERE id=1;"; + + var rst = mySql.ExecuteAffectedRows(sql); + mySql.Close(); + + if (string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":200}"; + } + if (!string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + + /// + /// 充值二维码 + /// + /// + /// + public string GetTopUpQrcode(string inputData) + { + if (!string.IsNullOrEmpty(inputData)) + { + if (!GetSign(inputData)) + return "{\"code\":999,\"msg\":\"校验失败\"}"; + + string conn = System.Configuration.ConfigurationManager.ConnectionStrings["ConnKJD"].ConnectionString; + MysqlUtils mySql = new MysqlUtils(conn); + string sql = "SELECT qrcode_base64 from wxxd.user_top_up_qrcode WHERE id = 1;"; + + var qrcode_base64 = mySql.ExecuteFirst(sql); + mySql.Close(); + + if (string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":200, \"qrcode_base64\":\"" + qrcode_base64 + "\"}"; + } + if (!string.IsNullOrEmpty(mySql.Message)) + { + return "{\"code\":500,\"msg\":\"" + mySql.Message + "\"}"; + } + } + return "{\"code\":19999,\"msg\":\"输入为空\"}"; + } + /// /// temu退回包裹的密钥 /// diff --git a/KJDService/KJD_WebService/WXUserService.asmx.cs b/KJDService/KJD_WebService/WXUserService.asmx.cs index 820bca5..db62122 100644 --- a/KJDService/KJD_WebService/WXUserService.asmx.cs +++ b/KJDService/KJD_WebService/WXUserService.asmx.cs @@ -209,5 +209,29 @@ namespace KJD_Web Context.Response.Write(result); Context.Response.End(); } + + [WebMethod] + public void update_top_up_qrcode() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXUserManage().UpdateTopUpQrcode(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + [WebMethod] + public void get_top_up_qrcode() + { + string jsontext = GetRequestJsonString(); + + var result = jsontext; + result = new WXUserManage().GetTopUpQrcode(jsontext); + + Context.Response.Write(result); + Context.Response.End(); + } + //UpdateTopUpQrcode } } diff --git a/KJDService/KJD_WebService/Web.config b/KJDService/KJD_WebService/Web.config index e8df77c..523dd30 100644 --- a/KJDService/KJD_WebService/Web.config +++ b/KJDService/KJD_WebService/Web.config @@ -8,11 +8,11 @@ + + + - - - diff --git a/PackTools/29wx.ico b/PackTools/29wx.ico new file mode 100644 index 0000000..059d46c Binary files /dev/null and b/PackTools/29wx.ico differ diff --git a/PackTools/Publish/Publish/Form1.Designer.cs b/PackTools/Publish/Publish/Form1.Designer.cs index f87617e..2cdf6a1 100644 --- a/PackTools/Publish/Publish/Form1.Designer.cs +++ b/PackTools/Publish/Publish/Form1.Designer.cs @@ -52,7 +52,7 @@ namespace Publish this.lstFile.Items.AddRange(new object[] { "Work.dll", "AllBase.dll", - "TemuKJD.exe"}); + "29供应链.exe"}); this.lstFile.Location = new System.Drawing.Point(12, 12); this.lstFile.Name = "lstFile"; this.lstFile.Size = new System.Drawing.Size(529, 388); diff --git a/PackTools/package260507pdd.nsi b/PackTools/package260507pdd.nsi index ba8a6a1..8f593ce 100644 --- a/PackTools/package260507pdd.nsi +++ b/PackTools/package260507pdd.nsi @@ -64,7 +64,7 @@ Section "MainSection" SEC01 SetOverwrite on ;/x ųĿ¼ļ ;File /r /x "Config.xml" /x "TemuKJD.exe.choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "TemuKJD.pdb" /x "data" "${BIN_PATH}\*.*" - File /r /x "Config.xml" /x "TemuKJD.exe.choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" "${BIN_PATH}\*.*" + File /r /x "Config.xml" /x "TemuKJD.exe.choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx" /x "29wx.ico" "${BIN_PATH}\*.*" CreateDirectory "$SMPROGRAMS\29Ӧ" CreateShortCut "$SMPROGRAMS\29Ӧ\29Ӧ.lnk" "$INSTDIR\TemuKJD.exe" "" "$INSTDIR\29pdd.ico" CreateShortCut "$DESKTOP\29Ӧ.lnk" "$INSTDIR\TemuKJD.exe" "" "$INSTDIR\29pdd.ico" diff --git a/PackTools/package260528pdd.nsi b/PackTools/package260528pdd.nsi new file mode 100644 index 0000000..fb542a1 --- /dev/null +++ b/PackTools/package260528pdd.nsi @@ -0,0 +1,149 @@ +; ýűʹ HM VNISEdit ű༭򵼲 + +; װʼ峣 +!define PRODUCT_NAME "29Ӧ-ƴ" +!define PRODUCT_VERSION "v11.17" +!define PRODUCT_PUBLISHER "29Ӧ" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29Ӧ.exe" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +!define PRODUCT_UNINST_ROOT_KEY "HKLM" +!define BUILD_PATH "D:\Project\TEMU羳̨\KJD Cef138\PackTools" +!define BIN_PATH "D:\Project\TEMU羳̨\KJD Cef138\Bin" + +SetCompressor lzma + +; ------ MUI ִ涨 (1.67 汾ϼ) ------ +!include "MUI.nsh" + +; MUI Ԥ峣 +!define MUI_ABORTWARNING +!define MUI_ICON "${BUILD_PATH}\29pdd.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" + +; ѡ񴰿ڳ +!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" +!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language" + +; ӭҳ +!insertmacro MUI_PAGE_WELCOME +; Эҳ +!define MUI_LICENSEPAGE_CHECKBOX +!insertmacro MUI_PAGE_LICENSE "${BUILD_PATH}\Licence.txt" +; װĿ¼ѡҳ +!insertmacro MUI_PAGE_DIRECTORY +; װҳ +!insertmacro MUI_PAGE_INSTFILES +; װҳ +;!define MUI_FINISHPAGE_RUN "$INSTDIR\29Ӧ.exe" +!insertmacro MUI_PAGE_FINISH + +; װжعҳ +!insertmacro MUI_UNPAGE_INSTFILES + +; װ +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "SimpChinese" + +; װԤͷļ +!insertmacro MUI_RESERVEFILE_LANGDLL +!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS +; ------ MUI ִ涨 ------ + +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +OutFile "29Ӧ-ƴ.exe" +InstallDir "$PROGRAMFILES\29Ӧ-ƴ" +InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" +ShowInstDetails show +ShowUnInstDetails show +BrandingText "29Ӧ-ƴ߰װ" + +Section "MainSection" SEC01 + SetOutPath "$INSTDIR" + ;SetOverwrite on|off|try|ifnewer ;ǿƸ||ǿдļ|Ǿļ + SetOverwrite on + ;/x ųĿ¼ļ + ;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29Ӧ.pdb" /x "data" "${BIN_PATH}\*.*" + File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29wx.lnk" /x "29wx.ico" "${BIN_PATH}\*.*" + CreateDirectory "$SMPROGRAMS\29Ӧ-ƴ" + CreateShortCut "$SMPROGRAMS\29Ӧ-ƴ\29Ӧ-ƴ.lnk" "$INSTDIR\29Ӧ.exe" "" "$INSTDIR\29pdd.ico" + CreateShortCut "$DESKTOP\29Ӧ-ƴ.lnk" "$INSTDIR\29Ӧ.exe" "" "$INSTDIR\29pdd.ico" + File "${BIN_PATH}\29Ӧ.exe" + ;SetOutPath "$TEMP" + ;File "${BUILD_PATH}\bin\VC_redist_2015_2022.x64.exe" + ;ExecWait '$TEMP\vc_redist.x86.exe' # һ(ǾĬ)VCİװ + ;ExecWait '"$TEMP\vc_redist.x86.exe" /q' # silent install Ĭװ +SectionEnd + +Section -AdditionalIcons + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\29Ӧ-ƴ\Uninstall.lnk" "$INSTDIR\uninst.exe" +SectionEnd + +Section -Post + WriteUninstaller "$INSTDIR\uninst.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29Ӧ.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\29Ӧ.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" +SectionEnd + +#-- NSIS ű༭ Function α Section ֮дԱⰲװδԤ֪⡣--# + +Function .onInit + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd + +/****************************** + * ǰװжز * + ******************************/ + +Section Uninstall + Delete "$INSTDIR\uninst.exe" + Delete "$TEMP\vc_redist.x86.exe" + Delete "$INSTDIR\29Ӧ.exe" + + Delete "$SMPROGRAMS\29Ӧ-ƴ\Uninstall.lnk" + Delete "$DESKTOP\29Ӧ-ƴ.lnk" + Delete "$SMPROGRAMS\29Ӧ-ƴ\29Ӧ-ƴ.lnk" + + RMDir "$SMPROGRAMS\29Ӧ-ƴ" + + RMDir /r "$INSTDIR\blob_storage" + RMDir /r "$INSTDIR\Cache" + RMDir /r "$INSTDIR\config" + RMDir /r "$INSTDIR\data" + RMDir /r "$INSTDIR\DawnCache" + RMDir /r "$INSTDIR\GPUCache" + RMDir /r "$INSTDIR\locales" + RMDir /r "$INSTDIR\log" + RMDir /r "$INSTDIR\ru-ru" + RMDir /r "$INSTDIR\static" + RMDir /r "$INSTDIR\taobao" + RMDir /r "$INSTDIR\temp" + RMDir /r "$INSTDIR\upBak" + RMDir /r "$INSTDIR\upTemp" + RMDir /r "$INSTDIR\x64" + RMDir /r "$INSTDIR\x86" + + RMDir /r "$INSTDIR" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + SetAutoClose true +SectionEnd + +#-- NSIS ű༭ Function α Section ֮дԱⰲװδԤ֪⡣--# + +Function un.onInit +!insertmacro MUI_UNGETLANGUAGE + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "ȷʵҪȫƳ $(^Name) е" IDYES +2 + Abort +FunctionEnd + +Function un.onUninstSuccess + HideWindow + MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) ѳɹشļƳ" +FunctionEnd diff --git a/PackTools/package260528wx.nsi b/PackTools/package260528wx.nsi new file mode 100644 index 0000000..ccf05be --- /dev/null +++ b/PackTools/package260528wx.nsi @@ -0,0 +1,149 @@ +; ýűʹ HM VNISEdit ű༭򵼲 + +; װʼ峣 +!define PRODUCT_NAME "29Ӧ-΢С" +!define PRODUCT_VERSION "v11.17" +!define PRODUCT_PUBLISHER "29Ӧ" +!define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\29Ӧ.exe" +!define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}" +!define PRODUCT_UNINST_ROOT_KEY "HKLM" +!define BUILD_PATH "D:\Project\TEMU羳̨\KJD Cef138\PackTools" +!define BIN_PATH "D:\Project\TEMU羳̨\KJD Cef138\Bin" + +SetCompressor lzma + +; ------ MUI ִ涨 (1.67 汾ϼ) ------ +!include "MUI.nsh" + +; MUI Ԥ峣 +!define MUI_ABORTWARNING +!define MUI_ICON "${BUILD_PATH}\29wx.ico" +!define MUI_UNICON "${NSISDIR}\Contrib\Graphics\Icons\modern-uninstall.ico" + +; ѡ񴰿ڳ +!define MUI_LANGDLL_REGISTRY_ROOT "${PRODUCT_UNINST_ROOT_KEY}" +!define MUI_LANGDLL_REGISTRY_KEY "${PRODUCT_UNINST_KEY}" +!define MUI_LANGDLL_REGISTRY_VALUENAME "NSIS:Language" + +; ӭҳ +!insertmacro MUI_PAGE_WELCOME +; Эҳ +!define MUI_LICENSEPAGE_CHECKBOX +!insertmacro MUI_PAGE_LICENSE "${BUILD_PATH}\Licence.txt" +; װĿ¼ѡҳ +!insertmacro MUI_PAGE_DIRECTORY +; װҳ +!insertmacro MUI_PAGE_INSTFILES +; װҳ +!define MUI_FINISHPAGE_RUN "$INSTDIR\29Ӧ.exe" +!insertmacro MUI_PAGE_FINISH + +; װжعҳ +!insertmacro MUI_UNPAGE_INSTFILES + +; װ +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_LANGUAGE "SimpChinese" + +; װԤͷļ +!insertmacro MUI_RESERVEFILE_LANGDLL +!insertmacro MUI_RESERVEFILE_INSTALLOPTIONS +; ------ MUI ִ涨 ------ + +Name "${PRODUCT_NAME} ${PRODUCT_VERSION}" +OutFile "29Ӧ-΢С.exe" +InstallDir "$PROGRAMFILES\29Ӧ-΢С" +InstallDirRegKey HKLM "${PRODUCT_UNINST_KEY}" "UninstallString" +ShowInstDetails show +ShowUnInstDetails show +BrandingText "29Ӧ-΢С߰װ" + +Section "MainSection" SEC01 + SetOutPath "$INSTDIR" + ;SetOverwrite on|off|try|ifnewer ;ǿƸ||ǿдļ|Ǿļ + SetOverwrite on + ;/x ųĿ¼ļ + ;File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "AllBase.pdb" /x "Work.pdb" /x "29Ӧ.pdb" /x "data" "${BIN_PATH}\*.*" + File /r /x "Config.xml" /x "choice.debug.tools" /x "DB.dll" /x "Publish.exe" /x "*.pdb" /x "*.zip" /x "data" /x "Cache" /x "29pdd.lnk" /x "29pdd.ico" "${BIN_PATH}\*.*" + CreateDirectory "$SMPROGRAMS\29Ӧ-΢С" + CreateShortCut "$SMPROGRAMS\29Ӧ-΢С\29Ӧ-΢С.lnk" "$INSTDIR\29Ӧ.exe" "" "$INSTDIR\29wx.ico" + CreateShortCut "$DESKTOP\29Ӧ-΢С.lnk" "$INSTDIR\29Ӧ.exe" "" "$INSTDIR\29wx.ico" + File "${BIN_PATH}\29Ӧ.exe" + ;SetOutPath "$TEMP" + ;File "${BUILD_PATH}\bin\VC_redist_2015_2022.x64.exe" + ;ExecWait '$TEMP\vc_redist.x86.exe' # һ(ǾĬ)VCİװ + ;ExecWait '"$TEMP\vc_redist.x86.exe" /q' # silent install Ĭװ +SectionEnd + +Section -AdditionalIcons + SetOutPath $INSTDIR + CreateShortCut "$SMPROGRAMS\29Ӧ-΢С\Uninstall.lnk" "$INSTDIR\uninst.exe" +SectionEnd + +Section -Post + WriteUninstaller "$INSTDIR\uninst.exe" + WriteRegStr HKLM "${PRODUCT_DIR_REGKEY}" "" "$INSTDIR\29Ӧ.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayName" "$(^Name)" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "UninstallString" "$INSTDIR\uninst.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayIcon" "$INSTDIR\29Ӧ.exe" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "DisplayVersion" "${PRODUCT_VERSION}" + WriteRegStr ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" "Publisher" "${PRODUCT_PUBLISHER}" +SectionEnd + +#-- NSIS ű༭ Function α Section ֮дԱⰲװδԤ֪⡣--# + +Function .onInit + !insertmacro MUI_LANGDLL_DISPLAY +FunctionEnd + +/****************************** + * ǰװжز * + ******************************/ + +Section Uninstall + Delete "$INSTDIR\uninst.exe" + Delete "$TEMP\vc_redist.x86.exe" + Delete "$INSTDIR\29Ӧ.exe" + + Delete "$SMPROGRAMS\29Ӧ-΢С\Uninstall.lnk" + Delete "$DESKTOP\29Ӧ-΢С.lnk" + Delete "$SMPROGRAMS\29Ӧ-΢С\29Ӧ-΢С.lnk" + + RMDir "$SMPROGRAMS\29Ӧ-΢С" + + RMDir /r "$INSTDIR\blob_storage" + RMDir /r "$INSTDIR\Cache" + RMDir /r "$INSTDIR\config" + RMDir /r "$INSTDIR\data" + RMDir /r "$INSTDIR\DawnCache" + RMDir /r "$INSTDIR\GPUCache" + RMDir /r "$INSTDIR\locales" + RMDir /r "$INSTDIR\log" + RMDir /r "$INSTDIR\ru-ru" + RMDir /r "$INSTDIR\static" + RMDir /r "$INSTDIR\taobao" + RMDir /r "$INSTDIR\temp" + RMDir /r "$INSTDIR\upBak" + RMDir /r "$INSTDIR\upTemp" + RMDir /r "$INSTDIR\x64" + RMDir /r "$INSTDIR\x86" + + RMDir /r "$INSTDIR" + + DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}" + DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}" + SetAutoClose true +SectionEnd + +#-- NSIS ű༭ Function α Section ֮дԱⰲװδԤ֪⡣--# + +Function un.onInit +!insertmacro MUI_UNGETLANGUAGE + MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "ȷʵҪȫƳ $(^Name) е" IDYES +2 + Abort +FunctionEnd + +Function un.onUninstSuccess + HideWindow + MessageBox MB_ICONINFORMATION|MB_OK "$(^Name) ѳɹشļƳ" +FunctionEnd diff --git a/TEMUKJD/29common_icon.ico b/TEMUKJD/29common_icon.ico new file mode 100644 index 0000000..b436bae Binary files /dev/null and b/TEMUKJD/29common_icon.ico differ diff --git a/TEMUKJD/29pdd.ico b/TEMUKJD/29pdd.ico new file mode 100644 index 0000000..2c19894 Binary files /dev/null and b/TEMUKJD/29pdd.ico differ diff --git a/TEMUKJD/29wx.ico b/TEMUKJD/29wx.ico new file mode 100644 index 0000000..059d46c Binary files /dev/null and b/TEMUKJD/29wx.ico differ diff --git a/TEMUKJD/KJD.csproj b/TEMUKJD/KJD.csproj index 32f5e94..690d057 100644 --- a/TEMUKJD/KJD.csproj +++ b/TEMUKJD/KJD.csproj @@ -10,7 +10,7 @@ {B8EE868D-56CD-4647-BBA5-04BEF24FF9F6} WinExe TemuKJD - TemuKJD + 29供应链 v4.6.2 512 true @@ -55,7 +55,7 @@ 4 - icon.ico + 29common_icon.ico @@ -270,6 +270,12 @@ VDianUploadProductForm.cs + + Form + + + WXAdminSetTopUpQrCodeForm.cs + Form @@ -336,6 +342,12 @@ WXFinderSquareForm.cs + + Form + + + WXGetTopUpQrCode.cs + Form @@ -1357,6 +1369,9 @@ VDianUploadProductForm.cs + + WXAdminSetTopUpQrCodeForm.cs + WXSaleAssistantForm.cs @@ -1423,6 +1438,9 @@ WXProductForm.cs + + WXGetTopUpQrCode.cs + WXShopDefaultAddressEditForm.cs @@ -1851,6 +1869,7 @@ + diff --git a/TEMUKJD/PDDForms/ProductForms/WXProdViolationManage.cs b/TEMUKJD/PDDForms/ProductForms/WXProdViolationManage.cs index 7873c81..2730e48 100644 --- a/TEMUKJD/PDDForms/ProductForms/WXProdViolationManage.cs +++ b/TEMUKJD/PDDForms/ProductForms/WXProdViolationManage.cs @@ -78,7 +78,7 @@ namespace TemuKJD.PDDForms.ProductForms //相似同款低质商品 不当使用他人权利 if (!punishReason.Contains("发布违禁信息") && !punishReason.Contains("材质夸大宣传") && !punishReason.Contains("相似同款低质商品") && !punishReason.Contains("价格违规") && !punishReason.Contains("售假") && !punishReason.Contains("品牌资质问题") && - !punishReason.Contains("不当使用他人权利")) + !punishReason.Contains("不当使用他人权利") && !punishReason.Contains("用户反馈虚假宣传")) continue; if (!string.IsNullOrWhiteSpace(productDesc) && !string.IsNullOrWhiteSpace(productId)) { diff --git a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs index d19049a..4812594 100644 --- a/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs +++ b/TEMUKJD/PDDForms/ProductSelectForms/PDDDBProdEditForm.cs @@ -61,8 +61,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms else if (!string.IsNullOrWhiteSpace(dbProd.sku_img_replace_base64)) this.pictureBox2.Image = Base64ChangeImgUrl.Base64ToImage(dbProd.sku_img_replace_base64); // Convert.FromBase64String(dbProd.sku_img_replace_base64); - if (dbProd.product_get_type_text == "厂商直采" || dbProd.product_get_type_text == "微信店采") - btnEditDetail.Text = "查看商品SKU"; + //if (dbProd.product_get_type_text == "厂商直采" || dbProd.product_get_type_text == "微信店采") + //btnEditDetail.Text = "查看商品SKU"; } } @@ -311,8 +311,8 @@ namespace TemuKJD.PDDForms.ProductSelectForms PDDDBProdEditDetailForm editDetailForm = new PDDDBProdEditDetailForm(this.dbProd); if (!canEdit) { - editDetailForm.btnRestoreAll.Visible = false; - editDetailForm.btnSaveSkuLst.Visible = false; + //editDetailForm.btnRestoreAll.Visible = false; + //editDetailForm.btnSaveSkuLst.Visible = false; } editDetailForm.ShowDialog(); } diff --git a/TEMUKJD/Properties/AssemblyInfo.cs b/TEMUKJD/Properties/AssemblyInfo.cs index 7099e05..b5c55b4 100644 --- a/TEMUKJD/Properties/AssemblyInfo.cs +++ b/TEMUKJD/Properties/AssemblyInfo.cs @@ -5,12 +5,13 @@ using System.Runtime.InteropServices; // 有关程序集的一般信息由以下 // 控制。更改这些特性值可修改 // 与程序集关联的信息。 -[assembly: AssemblyTitle("Temu跨境达管理软件")] -[assembly: AssemblyDescription("TemuKJD")] +///[assembly: AssemblyTitle("Temu跨境达管理软件")] +[assembly: AssemblyTitle("29供应链")] +[assembly: AssemblyDescription("29GYL")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("TemuKJD")] -[assembly: AssemblyCopyright("Copyright © 2025")] +[assembly: AssemblyProduct("29GYL")] +[assembly: AssemblyCopyright("Copyright © 2026")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/TEMUKJD/Resources/common_icon.ico b/TEMUKJD/Resources/common_icon.ico new file mode 100644 index 0000000..b436bae Binary files /dev/null and b/TEMUKJD/Resources/common_icon.ico differ diff --git a/TEMUKJD/UserForm/LoginForm.cs b/TEMUKJD/UserForm/LoginForm.cs index 5a116f9..a9640a9 100644 --- a/TEMUKJD/UserForm/LoginForm.cs +++ b/TEMUKJD/UserForm/LoginForm.cs @@ -53,7 +53,7 @@ namespace TemuKJD.UserForm GetUserList(); #if DEBUG - if (File.Exists(System.Environment.CurrentDirectory + "\\TemuKJD.exe.choice.debug.tools")) + if (File.Exists(System.Environment.CurrentDirectory + "\\choice.debug.tools")) { grpEnvironmentChoice.Visible = true; pnlShowRemember.Visible = true; diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs index 3d7835f..8ac3533 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminForm.Designer.cs @@ -40,7 +40,8 @@ System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("带货助手"); System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("图片工具"); System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("运单管理"); - System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] { + System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("充值二维码"); + System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("超级权限管理", new System.Windows.Forms.TreeNode[] { treeNode1, treeNode2, treeNode3, @@ -52,7 +53,8 @@ treeNode9, treeNode10, treeNode11, - treeNode12}); + treeNode12, + treeNode13}); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); @@ -167,10 +169,12 @@ treeNode11.Text = "图片工具"; treeNode12.Name = "运单管理"; treeNode12.Text = "运单管理"; - treeNode13.Name = "超级权限管理"; - treeNode13.Text = "超级权限管理"; + treeNode13.Name = "充值二维码"; + treeNode13.Text = "充值二维码"; + treeNode14.Name = "超级权限管理"; + treeNode14.Text = "超级权限管理"; this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode13}); + treeNode14}); this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); this.tv.Size = new System.Drawing.Size(140, 446); this.tv.TabIndex = 1; diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs index bdf3bd1..3cb45d0 100644 --- a/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs +++ b/TEMUKJD/WXForms/AdminForms/WXAdminForm.cs @@ -30,6 +30,7 @@ namespace TemuKJD.WXForms.AdminForms public Lazy randomComProductForm = new Lazy(); public Lazy waybillManageForm = new Lazy(); public Lazy banPlatformForm = new Lazy(); + public Lazy adminSetTopUpQrCodeForm = new Lazy(); public WXAdminForm() { @@ -119,6 +120,9 @@ namespace TemuKJD.WXForms.AdminForms case "运单管理": SetForm(waybillManageForm.Value); break; + case "充值二维码": + SetForm(adminSetTopUpQrCodeForm.Value); + break; } //})); //}).Start(); diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.Designer.cs b/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.Designer.cs new file mode 100644 index 0000000..7118f5e --- /dev/null +++ b/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.Designer.cs @@ -0,0 +1,118 @@ + +namespace TemuKJD.WXForms.AdminForms +{ + partial class WXAdminSetTopUpQrCodeForm + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.btnUploadImg = new DevComponents.DotNetBar.PanelEx(); + this.btnRefresh = new DevComponents.DotNetBar.PanelEx(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + this.SuspendLayout(); + // + // pictureBox1 + // + this.pictureBox1.Location = new System.Drawing.Point(30, 30); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(384, 384); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox1.TabIndex = 2; + this.pictureBox1.TabStop = false; + // + // btnUploadImg + // + this.btnUploadImg.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnUploadImg.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnUploadImg.DisabledBackColor = System.Drawing.Color.Empty; + this.btnUploadImg.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnUploadImg.Location = new System.Drawing.Point(330, 420); + this.btnUploadImg.Name = "btnUploadImg"; + this.btnUploadImg.Size = new System.Drawing.Size(84, 23); + this.btnUploadImg.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnUploadImg.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnUploadImg.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnUploadImg.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnUploadImg.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnUploadImg.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnUploadImg.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnUploadImg.Style.GradientAngle = 90; + this.btnUploadImg.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnUploadImg.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnUploadImg.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnUploadImg.TabIndex = 1124; + this.btnUploadImg.Text = "上传二维码"; + this.btnUploadImg.Click += new System.EventHandler(this.btnUploadImg_Click); + // + // btnRefresh + // + this.btnRefresh.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRefresh.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRefresh.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRefresh.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRefresh.Location = new System.Drawing.Point(240, 420); + this.btnRefresh.Name = "btnRefresh"; + this.btnRefresh.Size = new System.Drawing.Size(84, 23); + this.btnRefresh.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefresh.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefresh.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefresh.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRefresh.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRefresh.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRefresh.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRefresh.Style.GradientAngle = 90; + this.btnRefresh.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefresh.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefresh.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefresh.TabIndex = 1131; + this.btnRefresh.Text = "刷新"; + this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click); + // + // WXAdminSetTopUpQrCodeForm + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(800, 494); + this.Controls.Add(this.btnRefresh); + this.Controls.Add(this.btnUploadImg); + this.Controls.Add(this.pictureBox1); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Name = "WXAdminSetTopUpQrCodeForm"; + this.Text = "SetTopUpQrCodeForm"; + this.Load += new System.EventHandler(this.WXAdminSetTopUpQrCodeForm_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.PictureBox pictureBox1; + private DevComponents.DotNetBar.PanelEx btnUploadImg; + private DevComponents.DotNetBar.PanelEx btnRefresh; + } +} \ No newline at end of file diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.cs b/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.cs new file mode 100644 index 0000000..4db5284 --- /dev/null +++ b/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.cs @@ -0,0 +1,98 @@ +using AllBase; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.IO; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using TemuKJD.BaseForms; +using Work; +using Work.BLL.Tools; + +namespace TemuKJD.WXForms.AdminForms +{ + public partial class WXAdminSetTopUpQrCodeForm : Form + { + public WXAdminSetTopUpQrCodeForm() + { + InitializeComponent(); + } + + private void btnUploadImg_Click(object sender, EventArgs e) + { + OpenFileDialog openFileDialog = new OpenFileDialog(); + openFileDialog.Multiselect = false; + // 设置过滤条件，只显示文本文件 + openFileDialog.Filter = "图片文件 (*.jpeg;*.jpg;*.png)|*.jpeg;*.jpg;*.png|All files (*.*)|*.*"; + // 显示对话框并获取结果 + if (openFileDialog.ShowDialog() == DialogResult.OK) + { + try + { + string filePath = openFileDialog.FileName; + Image image = Image.FromFile(filePath); + + string imgBase64 = ""; + using (MemoryStream memoryStream = new MemoryStream()) + { + image.Save(memoryStream, System.Drawing.Imaging.ImageFormat.Jpeg); + byte[] imageBytes = memoryStream.ToArray(); + imgBase64 = Convert.ToBase64String(imageBytes); + } + + var url = BaseClass.BuildWXObjString("user/update_top_up_qrcode"); + var data = UserLogin.GetSignaturex(); + data += "&qrcode_base64=" + imgBase64; + + var html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + var msg = BaseRegex.GetStringJson(ref html, "msg"); + } + + refreshQrcode(); + } + catch (Exception ex) + { + BaseMsgForm.ShowError("打开二维码图片失败 " + ex.Message); + return; + } + } + } + + private void WXAdminSetTopUpQrCodeForm_Load(object sender, EventArgs e) + { + refreshQrcode(); + } + + public void refreshQrcode() + { + + + var url = BaseClass.BuildWXObjString("user/get_top_up_qrcode"); + var data = UserLogin.GetSignaturex(); + + var html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + var msg = BaseRegex.GetStringJson(ref html, "msg"); + BaseMsgForm.ShowError(msg); + } + else + { + var base64Str = BaseRegex.GetStringJson(ref html, "qrcode_base64"); + if (!string.IsNullOrEmpty(base64Str)) + pictureBox1.Image = Base64ChangeImgUrl.Base64ToImage(base64Str); + } + } + + private void btnRefresh_Click(object sender, EventArgs e) + { + refreshQrcode(); + } + } +} diff --git a/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.resx b/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TEMUKJD/WXForms/AdminForms/WXAdminSetTopUpQrCodeForm.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.Designer.cs b/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.Designer.cs index 67b6282..df6d5b5 100644 --- a/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.Designer.cs +++ b/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.Designer.cs @@ -40,6 +40,8 @@ namespace TemuKJD.WXForms.OrderForms this.txtGiftOrderWaybillId = new System.Windows.Forms.TextBox(); this.btnCancel = new DevComponents.DotNetBar.PanelEx(); this.ucGroupBoxEx4 = new TemuKJD.UserComponent.UcGroupBoxEx(this.components); + this.label5 = new System.Windows.Forms.Label(); + this.txtCurrentStock = new System.Windows.Forms.TextBox(); this.btnDownProduct = new DevComponents.DotNetBar.PanelEx(); this.btnClearStock = new DevComponents.DotNetBar.PanelEx(); this.txtOrderPrice = new System.Windows.Forms.TextBox(); @@ -55,8 +57,6 @@ namespace TemuKJD.WXForms.OrderForms this.numAddPrice = new System.Windows.Forms.NumericUpDown(); this.label1 = new System.Windows.Forms.Label(); this.btnAddPrice = new DevComponents.DotNetBar.PanelEx(); - this.txtCurrentStock = new System.Windows.Forms.TextBox(); - this.label5 = new System.Windows.Forms.Label(); this.panel1.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); this.ucGroupBoxEx1.SuspendLayout(); @@ -218,6 +218,28 @@ namespace TemuKJD.WXForms.OrderForms this.ucGroupBoxEx4.TabStop = false; this.ucGroupBoxEx4.Text = "优化订单商品"; // + // label5 + // + this.label5.AutoSize = true; + this.label5.Location = new System.Drawing.Point(286, 171); + this.label5.Name = "label5"; + this.label5.Size = new System.Drawing.Size(53, 17); + this.label5.TabIndex = 847; + this.label5.Text = "Sku库存"; + // + // txtCurrentStock + // + this.txtCurrentStock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.txtCurrentStock.BackColor = System.Drawing.SystemColors.Window; + this.txtCurrentStock.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.txtCurrentStock.Location = new System.Drawing.Point(342, 171); + this.txtCurrentStock.Name = "txtCurrentStock"; + this.txtCurrentStock.ReadOnly = true; + this.txtCurrentStock.Size = new System.Drawing.Size(82, 16); + this.txtCurrentStock.TabIndex = 846; + this.txtCurrentStock.Text = "currentStock"; + // // btnDownProduct // this.btnDownProduct.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right))); @@ -433,28 +455,6 @@ namespace TemuKJD.WXForms.OrderForms this.btnAddPrice.Text = "改价"; this.btnAddPrice.Click += new System.EventHandler(this.btnAddPrice_Click); // - // txtCurrentStock - // - this.txtCurrentStock.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) - | System.Windows.Forms.AnchorStyles.Right))); - this.txtCurrentStock.BackColor = System.Drawing.SystemColors.Window; - this.txtCurrentStock.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.txtCurrentStock.Location = new System.Drawing.Point(342, 171); - this.txtCurrentStock.Name = "txtCurrentStock"; - this.txtCurrentStock.ReadOnly = true; - this.txtCurrentStock.Size = new System.Drawing.Size(82, 16); - this.txtCurrentStock.TabIndex = 846; - this.txtCurrentStock.Text = "currentStock"; - // - // label5 - // - this.label5.AutoSize = true; - this.label5.Location = new System.Drawing.Point(286, 171); - this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(53, 17); - this.label5.TabIndex = 847; - this.label5.Text = "Sku库存"; - // // WXOrderListOptimizeForm // this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; @@ -465,6 +465,7 @@ namespace TemuKJD.WXForms.OrderForms this.Name = "WXOrderListOptimizeForm"; this.Text = "优化订单"; this.TitleText = "优化订单"; + this.Load += new System.EventHandler(this.WXOrderListOptimizeForm_Load); this.Controls.SetChildIndex(this.panel1, 0); this.panel1.ResumeLayout(false); ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); diff --git a/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.cs b/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.cs index 1ecf773..7093470 100644 --- a/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.cs +++ b/TEMUKJD/WXForms/OrderForms/WXOrderListOptimizeForm.cs @@ -33,6 +33,8 @@ namespace TemuKJD.WXForms.OrderForms this.Close(); } + + public JObject prodObj = new JObject(); public bool EditPriceSuccess { get; set; } = false; public bool SendGiftSuccess { get; set; } = false; @@ -58,6 +60,11 @@ namespace TemuKJD.WXForms.OrderForms { var str = JsonHelper.SerializeObject(prodObj); } + if (prodObj == null) + { + BaseMsgForm.ShowError("源商品已删除"); + return; + } //var rst = WXOrderList.EditPrice(shop, lblSpuId.Text, lblSkuId.Text, (numAddPrice.Value * 100).ParseToInt()); @@ -244,6 +251,45 @@ namespace TemuKJD.WXForms.OrderForms this.Close(); })); } + + private void WXOrderListOptimizeForm_Load(object sender, EventArgs e) + { + var spuId = lblSpuId.Text; + int onSaleStatusCode = -1; + int pageSize = 50; + var getProdOnSaleRst = WXClearNoVisit.searchProduct(shop, 1, pageSize, spuId, onSaleStatusCode); + if (!getProdOnSaleRst.Contains("\"success\":true")) + { + var error = BaseRegex.GetStringJsonByRegs(ref getProdOnSaleRst, getProdOnSaleRst, "err_msg", "error_msg", "errMsg", "errorMsg", "msg"); + BaseMsgForm.ShowInfo("读取原价错误，请重新打开窗口 " + error); + } + prodObj = JsonHelper.JObjectParse(getProdOnSaleRst)["productList"].FirstOrDefault() as JObject; + if (prodObj != null) + { + var str = JsonHelper.SerializeObject(prodObj); + } + if (prodObj == null) + { + //BaseMsgForm.ShowError("源商品已删除"); + return; + } + + //var rst = WXOrderList.EditPrice(shop, lblSpuId.Text, lblSkuId.Text, (numAddPrice.Value * 100).ParseToInt()); + + JObject changePriceObj = new JObject(); + JArray skuArr = new JArray(); + foreach (var sku in prodObj["skuList"]) + { + JObject obj = new JObject(); + var skuId = sku["skuId"].ParseToString(); + var price = sku["price"].ParseToInt() * 0.01m; + if (skuId == this.lblSkuId.Text) + { + this.txtCurrentPrice.Text = price.ToString(); + break; + } + } + } } public class UpdateDeliverInfoParam diff --git a/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.Designer.cs new file mode 100644 index 0000000..577da05 --- /dev/null +++ b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.Designer.cs @@ -0,0 +1,119 @@ + +namespace TemuKJD.WXForms.ShopForms +{ + partial class WXGetTopUpQrCode + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + this.label1 = new System.Windows.Forms.Label(); + this.pictureBox1 = new System.Windows.Forms.PictureBox(); + this.btnRefresh = new DevComponents.DotNetBar.PanelEx(); + this.pbLoading = new System.Windows.Forms.PictureBox(); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).BeginInit(); + this.SuspendLayout(); + // + // label1 + // + this.label1.Font = new System.Drawing.Font("微软雅黑", 11F); + this.label1.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(64)))), ((int)(((byte)(0))))); + this.label1.Location = new System.Drawing.Point(30, 420); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(384, 44); + this.label1.TabIndex = 1; + this.label1.Text = "支付宝扫码充值，备注软件登录账户。如忘记备注，请联系购买方充值。"; + // + // pictureBox1 + // + this.pictureBox1.Location = new System.Drawing.Point(30, 30); + this.pictureBox1.Name = "pictureBox1"; + this.pictureBox1.Size = new System.Drawing.Size(384, 384); + this.pictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; + this.pictureBox1.TabIndex = 3; + this.pictureBox1.TabStop = false; + // + // btnRefresh + // + this.btnRefresh.ColorSchemeStyle = DevComponents.DotNetBar.eDotNetBarStyle.StyleManagerControlled; + this.btnRefresh.Cursor = System.Windows.Forms.Cursors.Hand; + this.btnRefresh.DisabledBackColor = System.Drawing.Color.Empty; + this.btnRefresh.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.btnRefresh.Location = new System.Drawing.Point(330, 467); + this.btnRefresh.Name = "btnRefresh"; + this.btnRefresh.Size = new System.Drawing.Size(84, 23); + this.btnRefresh.Style.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefresh.Style.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefresh.Style.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(63)))), ((int)(((byte)(126)))), ((int)(((byte)(255))))); + this.btnRefresh.Style.BorderColor.ColorSchemePart = DevComponents.DotNetBar.eColorSchemePart.PanelBorder; + this.btnRefresh.Style.BorderDashStyle = System.Drawing.Drawing2D.DashStyle.Dash; + this.btnRefresh.Style.BorderSide = DevComponents.DotNetBar.eBorderSide.None; + this.btnRefresh.Style.ForeColor.Color = System.Drawing.Color.White; + this.btnRefresh.Style.GradientAngle = 90; + this.btnRefresh.StyleMouseOver.Alignment = System.Drawing.StringAlignment.Center; + this.btnRefresh.StyleMouseOver.BackColor1.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefresh.StyleMouseOver.BackColor2.Color = System.Drawing.Color.FromArgb(((int)(((byte)(25)))), ((int)(((byte)(102)))), ((int)(((byte)(255))))); + this.btnRefresh.TabIndex = 1135; + this.btnRefresh.Text = "刷新"; + this.btnRefresh.Click += new System.EventHandler(this.btnRefresh_Click); + // + // pbLoading + // + this.pbLoading.Image = global::TemuKJD.Properties.Resources.loading_blue; + this.pbLoading.Location = new System.Drawing.Point(197, 197); + this.pbLoading.Name = "pbLoading"; + this.pbLoading.Size = new System.Drawing.Size(50, 50); + this.pbLoading.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage; + this.pbLoading.TabIndex = 1136; + this.pbLoading.TabStop = false; + this.pbLoading.Visible = false; + // + // WXGetTopUpQrCode + // + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; + this.BackColor = System.Drawing.Color.White; + this.ClientSize = new System.Drawing.Size(800, 522); + this.Controls.Add(this.pbLoading); + this.Controls.Add(this.btnRefresh); + this.Controls.Add(this.pictureBox1); + this.Controls.Add(this.label1); + this.Font = new System.Drawing.Font("微软雅黑", 9F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(134))); + this.Name = "WXGetTopUpQrCode"; + this.Text = "二维码充值"; + this.Load += new System.EventHandler(this.WXGetTopUpQrCode_Load); + ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).EndInit(); + ((System.ComponentModel.ISupportInitialize)(this.pbLoading)).EndInit(); + this.ResumeLayout(false); + + } + + #endregion + private System.Windows.Forms.Label label1; + private System.Windows.Forms.PictureBox pictureBox1; + private DevComponents.DotNetBar.PanelEx btnRefresh; + private System.Windows.Forms.PictureBox pbLoading; + } +} \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs new file mode 100644 index 0000000..cf47ba3 --- /dev/null +++ b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.cs @@ -0,0 +1,63 @@ +using AllBase; +using System; +using System.Collections.Generic; +using System.ComponentModel; +using System.Data; +using System.Drawing; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Forms; +using TemuKJD.BaseForms; +using Work; +using Work.BLL.Tools; + +namespace TemuKJD.WXForms.ShopForms +{ + public partial class WXGetTopUpQrCode : Form + { + public WXGetTopUpQrCode() + { + InitializeComponent(); + } + + public void refreshQrcode() + { + Invoke(new Action(() => + { + pbLoading.Visible = true; + })); + + var url = BaseClass.BuildWXObjString("user/get_top_up_qrcode"); + var data = UserLogin.GetSignaturex(); + + var html = GetHtml.PostUtf8(url, data); + if (string.IsNullOrEmpty(html) || !html.Contains("\"code\":200")) + { + var msg = BaseRegex.GetStringJson(ref html, "msg"); + BaseMsgForm.ShowError(msg); + } + else + { + Invoke(new Action(() => + { + pbLoading.Visible = false; + var base64Str = BaseRegex.GetStringJson(ref html, "qrcode_base64"); + if (!string.IsNullOrEmpty(base64Str)) + pictureBox1.Image = Base64ChangeImgUrl.Base64ToImage(base64Str); + })); + } + } + + private void btnRefresh_Click(object sender, EventArgs e) + { + Task.Run(() => { refreshQrcode(); }); + } + + private void WXGetTopUpQrCode_Load(object sender, EventArgs e) + { + Task.Run(() => { refreshQrcode(); }); + } + } + +} diff --git a/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.resx b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/TEMUKJD/WXForms/ShopForms/WXGetTopUpQrCode.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs b/TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs index aad839c..b5af3a9 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopForm.Designer.cs @@ -28,17 +28,19 @@ /// private void InitializeComponent() { - System.Windows.Forms.TreeNode treeNode1 = new System.Windows.Forms.TreeNode("店铺列表"); - System.Windows.Forms.TreeNode treeNode2 = new System.Windows.Forms.TreeNode("子账号管理"); - System.Windows.Forms.TreeNode treeNode3 = new System.Windows.Forms.TreeNode("店铺地址管理"); - System.Windows.Forms.TreeNode treeNode4 = new System.Windows.Forms.TreeNode("店铺经营统计"); - System.Windows.Forms.TreeNode treeNode5 = new System.Windows.Forms.TreeNode("评分考核"); - System.Windows.Forms.TreeNode treeNode6 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] { - treeNode1, - treeNode2, - treeNode3, - treeNode4, - treeNode5}); + System.Windows.Forms.TreeNode treeNode8 = new System.Windows.Forms.TreeNode("店铺列表"); + System.Windows.Forms.TreeNode treeNode9 = new System.Windows.Forms.TreeNode("子账号管理"); + System.Windows.Forms.TreeNode treeNode10 = new System.Windows.Forms.TreeNode("店铺地址管理"); + System.Windows.Forms.TreeNode treeNode11 = new System.Windows.Forms.TreeNode("店铺经营统计"); + System.Windows.Forms.TreeNode treeNode12 = new System.Windows.Forms.TreeNode("评分考核"); + System.Windows.Forms.TreeNode treeNode13 = new System.Windows.Forms.TreeNode("充值二维码"); + System.Windows.Forms.TreeNode treeNode14 = new System.Windows.Forms.TreeNode("店铺管理", new System.Windows.Forms.TreeNode[] { + treeNode8, + treeNode9, + treeNode10, + treeNode11, + treeNode12, + treeNode13}); this.panel1 = new System.Windows.Forms.Panel(); this.panel3 = new System.Windows.Forms.Panel(); this.panel2 = new System.Windows.Forms.Panel(); @@ -71,6 +73,7 @@ this.panel3.Name = "panel3"; this.panel3.Size = new System.Drawing.Size(792, 433); this.panel3.TabIndex = 1; + this.panel3.Paint += new System.Windows.Forms.PaintEventHandler(this.panel3_Paint); // // panel2 // @@ -129,20 +132,22 @@ this.tv.Location = new System.Drawing.Point(0, 0); this.tv.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); this.tv.Name = "tv"; - treeNode1.Name = "店铺列表"; - treeNode1.Text = "店铺列表"; - treeNode2.Name = "子账号管理"; - treeNode2.Text = "子账号管理"; - treeNode3.Name = "店铺地址管理"; - treeNode3.Text = "店铺地址管理"; - treeNode4.Name = "店铺经营统计"; - treeNode4.Text = "店铺经营统计"; - treeNode5.Name = "评分考核"; - treeNode5.Text = "评分考核"; - treeNode6.Name = "店铺管理"; - treeNode6.Text = "店铺管理"; + treeNode8.Name = "店铺列表"; + treeNode8.Text = "店铺列表"; + treeNode9.Name = "子账号管理"; + treeNode9.Text = "子账号管理"; + treeNode10.Name = "店铺地址管理"; + treeNode10.Text = "店铺地址管理"; + treeNode11.Name = "店铺经营统计"; + treeNode11.Text = "店铺经营统计"; + treeNode12.Name = "评分考核"; + treeNode12.Text = "评分考核"; + treeNode13.Name = "充值二维码"; + treeNode13.Text = "充值二维码"; + treeNode14.Name = "店铺管理"; + treeNode14.Text = "店铺管理"; this.tv.Nodes.AddRange(new System.Windows.Forms.TreeNode[] { - treeNode6}); + treeNode14}); this.tv.OverForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(235)))), ((int)(((byte)(235)))), ((int)(((byte)(235))))); this.tv.Size = new System.Drawing.Size(140, 461); this.tv.TabIndex = 1; diff --git a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs index dbe2972..1a7fc5c 100644 --- a/TEMUKJD/WXForms/ShopForms/WXShopForm.cs +++ b/TEMUKJD/WXForms/ShopForms/WXShopForm.cs @@ -26,6 +26,7 @@ namespace TemuKJD.WXForms.ShopForms public Lazy shopStatisticsForm = new Lazy(); public Lazy shopOptimizeForm = new Lazy(); public Lazy shopAfterSaleAddressListForm = new Lazy(); + public Lazy getTopUpQrCode = new Lazy(); public WXShopForm() @@ -39,7 +40,7 @@ namespace TemuKJD.WXForms.ShopForms tv.SelectedNode = tv.Nodes[0].Nodes[0]; tv.ExpandGroup(tv.Nodes[0].Name); - List hideName = new List() { "店铺地址管理", "评分考核", "子账号管理", "高级运费模板", "运费模板", "素材库管理", "订单金额统计", "工作明细统计", "店铺经营统计1" }; + List hideName = new List() { "充值二维码", "店铺地址管理", "评分考核", "子账号管理", "高级运费模板", "运费模板", "素材库管理", "订单金额统计", "工作明细统计", "店铺经营统计1" }; if (BaseClass.SaLevel == 1) { @@ -55,8 +56,12 @@ namespace TemuKJD.WXForms.ShopForms { hideName.Remove("评分考核"); } + if (BaseClass.UserAuthority.Contains("充值用户") && BaseClass.GroupId == 3) + { + hideName.Remove("充值二维码"); + } - foreach (var item in hideName) + foreach (var item in hideName) { var n = tv.Nodes[0].Nodes.Find(item, true); if (n.Count() > 0) @@ -101,6 +106,9 @@ namespace TemuKJD.WXForms.ShopForms case "评分考核": SetForm(shopOptimizeForm.Value); break; + case "充值二维码": + SetForm(getTopUpQrCode.Value); + break; } })); }).Start(); @@ -180,5 +188,10 @@ namespace TemuKJD.WXForms.ShopForms } catch { } } + + private void panel3_Paint(object sender, PaintEventArgs e) + { + + } } } diff --git a/Work/Initialization.cs b/Work/Initialization.cs index bce8efa..53be99a 100644 --- a/Work/Initialization.cs +++ b/Work/Initialization.cs @@ -101,7 +101,7 @@ offCountPara,false;offProductPara,100;IrregularitiesPara,true;noNeerPara,true;no //Task.Run(() => { new PinduoduoCatList().Get(); InitProgress(1); }); // pdd cate Task.Run(() => { GetMacCode(); InitProgress(1); }); #if DEBUG - if (!File.Exists(System.Environment.CurrentDirectory + "\\TemuKJD.exe.choice.debug.tools")) Task.Run(() => { new CheckHecker().Check(); InitProgress(2); }); // 防止破解 + if (!File.Exists(System.Environment.CurrentDirectory + "\\choice.debug.tools")) Task.Run(() => { new CheckHecker().Check(); InitProgress(2); }); // 防止破解 #else Task.Run(() => { new CheckHecker().Check(); InitProgress(2); }); // 防止破解 #endif @@ -328,9 +328,9 @@ offCountPara,false;offProductPara,100;IrregularitiesPara,true;noNeerPara,true;no var updateExeChk = BaseRegex.GetStringJson(ref html, "exe_check").ParseToString(); var updateExeAddress = BaseRegex.GetStringJson(ref html, "exe_address"); - var updateFileAddress = BaseRegex.GetStringJson(ref html, "file_address"); - updateFileAddress = updateFileAddress.Replace("/Update", "/Update" + BaseClass.MainPath); var newVersion = BaseRegex.GetIntJson(ref html, "next_version").ParseToInt(); + var updateFileAddress = BaseRegex.GetStringJson(ref html, "file_address"); + updateFileAddress = updateFileAddress.Replace(newVersion.ParseToString(), BaseClass.MainPath + newVersion); if (File.Exists(updatefilepath))